@bensandee/tooling 0.37.0 → 0.38.0

package/dist/{check-Ceom_OgJ.mjs → check-hutCTIXe.mjs}

@@ -1,5 +1,5 @@
 import * as clack from "@clack/prompts";
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { z } from "zod";
 //#region src/utils/log.ts
 const out = (msg) => console.log(msg);
@@ -18,6 +18,13 @@ function note(body, title) {
 }
 //#endregion
 //#region src/utils/debug.ts
+const REDACT_PATTERNS = [/x-access-token:[^\s@]+/g, /Authorization:\s*(?:token|Bearer)\s+\S+/gi];
+/** Redact secrets (tokens, credentials) from text before logging. */
+function redact(text) {
+	let result = text;
+	for (const pattern of REDACT_PATTERNS) result = result.replace(pattern, "[REDACTED]");
+	return result;
+}
 /** Check if verbose/debug mode is enabled via environment variables. */
 function isEnvVerbose() {
 	return process.env["TOOLING_DEBUG"] === "true";
@@ -29,9 +36,9 @@ function debug(config, message) {
 /** Log the result of an exec call when verbose mode is enabled. */
 function debugExec(config, label, result) {
 	if (!config.verbose) return;
-	const lines = [`[debug] ${label} (exit code ${String(result.exitCode)})`];
-	if (result.stdout.trim()) lines.push(`  stdout: ${result.stdout.trim()}`);
-	if (result.stderr.trim()) lines.push(`  stderr: ${result.stderr.trim()}`);
+	const lines = [`[debug] ${redact(label)} (exit code ${String(result.exitCode)})`];
+	if (result.stdout.trim()) lines.push(`  stdout: ${redact(result.stdout.trim())}`);
+	if (result.stderr.trim()) lines.push(`  stderr: ${redact(result.stderr.trim())}`);
 	log.info(lines.join("\n"));
 }
 //#endregion
@@ -45,10 +52,10 @@ function isExecSyncError(err) {
 /** Create an executor that runs real commands, fetches, and manages process signals. */
 function createRealExecutor() {
 	return {
-		exec(command, options) {
+		exec(file, args, options) {
 			try {
 				return {
-					stdout: execSync(command, {
+					stdout: execFileSync(file, args, {
 						cwd: options?.cwd,
 						env: options?.env ? {
 							...process.env,
@@ -77,8 +84,8 @@ function createRealExecutor() {
 				};
 			}
 		},
-		execInherit(command, options) {
-			execSync(command, {
+		execInherit(file, args, options) {
+			execFileSync(file, args, {
 				cwd: options?.cwd,
 				env: options?.env ? {
 					...process.env,
@@ -107,30 +114,45 @@ const ContainerInfoSchema = z.object({
 	Service: z.string(),
 	Health: z.string()
 });
-/** Build the `docker compose` base command string from config. */
-function composeCommand(config) {
-	return `docker compose ${config.composeFiles.map((f) => `-f ${f}`).join(" ")}${config.envFile ? ` --env-file ${config.envFile}` : ""}`;
+/** Build the `docker compose` base args from config. */
+function composeArgs(config) {
+	const args = ["compose"];
+	for (const f of config.composeFiles) args.push("-f", f);
+	if (config.envFile) args.push("--env-file", config.envFile);
+	return args;
 }
 /** Run the build command if configured. */
 function buildImages(executor, config) {
 	if (!config.buildCommand) return;
-	executor.execInherit(config.buildCommand, { cwd: config.buildCwd ?? config.compose.cwd });
+	const [file, ...args] = config.buildCommand;
+	if (!file) return;
+	executor.execInherit(file, args, { cwd: config.buildCwd ?? config.compose.cwd });
 }
 /** Start the compose stack in detached mode. */
 function composeUp(executor, config) {
-	executor.execInherit(`${composeCommand(config)} up -d`, { cwd: config.cwd });
+	executor.execInherit("docker", [
+		...composeArgs(config),
+		"up",
+		"-d"
+	], { cwd: config.cwd });
 }
 /** Tear down the compose stack, removing volumes and orphans. Swallows errors. */
 function composeDown(executor, config) {
 	try {
-		executor.execInherit(`${composeCommand(config)} down -v --remove-orphans`, { cwd: config.cwd });
+		executor.execInherit("docker", [
+			...composeArgs(config),
+			"down",
+			"-v",
+			"--remove-orphans"
+		], { cwd: config.cwd });
 	} catch (_error) {}
 }
 /** Show logs for a specific service (or all services if not specified). Swallows errors. */
 function composeLogs(executor, config, service) {
 	try {
-		const suffix = service ? ` ${service}` : "";
-		executor.execInherit(`${composeCommand(config)} logs${suffix}`, { cwd: config.cwd });
+		const args = [...composeArgs(config), "logs"];
+		if (service) args.push(service);
+		executor.execInherit("docker", args, { cwd: config.cwd });
 	} catch (_error) {}
 }
 /**
@@ -138,7 +160,12 @@ function composeLogs(executor, config, service) {
 * Handles both JSON array and newline-delimited JSON (varies by docker compose version).
 */
 function composePs(executor, config) {
-	const output = executor.exec(`${composeCommand(config)} ps --format json`, { cwd: config.cwd }).stdout.trim();
+	const output = executor.exec("docker", [
+		...composeArgs(config),
+		"ps",
+		"--format",
+		"json"
+	], { cwd: config.cwd }).stdout.trim();
 	if (!output) return [];
 	const ArraySchema = z.array(ContainerInfoSchema);
 	try {
@@ -275,4 +302,4 @@ async function runDockerCheck(executor, config) {
 	}
 }
 //#endregion
-export { composeDown as a, composeUp as c, debug as d, debugExec as f, note as h, composeCommand as i, createRealExecutor as l, log as m, checkHttpHealth as n, composeLogs as o, isEnvVerbose as p, getContainerHealth as r, composePs as s, runDockerCheck as t, isExecSyncError as u };
+export { composeDown as a, composeUp as c, debug as d, debugExec as f, note as g, log as h, composeArgs as i, createRealExecutor as l, redact as m, checkHttpHealth as n, composeLogs as o, isEnvVerbose as p, getContainerHealth as r, composePs as s, runDockerCheck as t, isExecSyncError as u };

package/dist/docker-check/index.d.mts

@@ -11,17 +11,22 @@ interface ExecResult {
 interface ExecOptions {
   cwd?: string;
   env?: Record<string, string>;
+  /** Data to pass to the command via stdin. */
+  input?: string;
+}
+/** Shared command execution and HTTP fetch interface. */
+interface BaseExecutor {
+  /** Run a command with arguments and return the result (stdout/stderr captured). */
+  exec(file: string, args: string[], options?: ExecOptions): ExecResult;
+  /** Run a command with arguments, streaming stdout/stderr to the console. */
+  execInherit(file: string, args: string[], options?: ExecOptions): void;
+  /** Perform an HTTP request (mirrors the global fetch signature). */
+  fetch(url: string, init?: RequestInit): Promise<Response>;
 }
 //#endregion
 //#region src/docker-check/types.d.ts
 /** Abstraction over side effects for testability. */
-interface DockerCheckExecutor {
-  /** Run a shell command and return the result (stdout/stderr captured). */
-  exec(command: string, options?: ExecOptions): ExecResult;
-  /** Run a shell command, streaming stdout/stderr to the console. */
-  execInherit(command: string, options?: ExecOptions): void;
-  /** Perform an HTTP request. */
-  fetch(url: string, init?: RequestInit): Promise<Response>;
+interface DockerCheckExecutor extends BaseExecutor {
   /** Get current time in ms (mockable clock). */
   now(): number;
   /** Sleep for the given duration (mockable delay). */
@@ -57,8 +62,8 @@ interface ComposeConfig {
 interface CheckConfig {
   /** Docker compose settings. */
   compose: ComposeConfig;
-  /** Optional build command to run before starting compose (e.g. "pnpm image:build"). */
-  buildCommand?: string;
+  /** Optional build command to run before starting compose (e.g. ["pnpm", "image:build"]). */
+  buildCommand?: string[];
   /** Working directory for the build command (defaults to compose.cwd). */
   buildCwd?: string;
   /** HTTP health checks to poll. All must pass for success. */
@@ -96,8 +101,8 @@ declare const ContainerInfoSchema: z.ZodObject<{
   Health: z.ZodString;
 }, z.core.$strip>;
 type ContainerInfo = z.infer<typeof ContainerInfoSchema>;
-/** Build the `docker compose` base command string from config. */
-declare function composeCommand(config: ComposeConfig): string;
+/** Build the `docker compose` base args from config. */
+declare function composeArgs(config: ComposeConfig): string[];
 /** Start the compose stack in detached mode. */
 declare function composeUp(executor: DockerCheckExecutor, config: ComposeConfig): void;
 /** Tear down the compose stack, removing volumes and orphans. Swallows errors. */
@@ -116,4 +121,4 @@ declare function getContainerHealth(containers: ContainerInfo[], serviceName: st
 /** Run a single HTTP health check, returning true if the validator passes. */
 declare function checkHttpHealth(executor: DockerCheckExecutor, check: HttpHealthCheck): Promise<boolean>;
 //#endregion
-export { type CheckConfig, type CheckResult, type ComposeConfig, type ContainerInfo, type DockerCheckExecutor, type HttpHealthCheck, checkHttpHealth, composeCommand, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };
+export { type CheckConfig, type CheckResult, type ComposeConfig, type ContainerInfo, type DockerCheckExecutor, type HttpHealthCheck, checkHttpHealth, composeArgs, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };

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-Ceom_OgJ.mjs";
-export { checkHttpHealth, composeCommand, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };
+import { a as composeDown, c as composeUp, i as composeArgs, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-hutCTIXe.mjs";
+export { checkHttpHealth, composeArgs, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };

package/dist/index.d.mts

@@ -86,6 +86,8 @@ interface DetectedProjectState {
   hasPackageJson: boolean;
   hasTsconfig: boolean;
   hasOxlintConfig: boolean;
+  /** Existing oxlint.config.ts already imports @bensandee/config/oxlint/recommended */
+  oxlintExtendsRecommended: boolean;
   /** Legacy .oxlintrc.json found (should be migrated to oxlint.config.ts) */
   hasLegacyOxlintJson: boolean;
   hasGitignore: boolean;

package/package.json

@@ -1,7 +1,13 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://codeberg.org/bensandee/tooling.git",
+    "directory": "packages/tooling-cli"
+  },
   "bin": {
     "bst": "./dist/bin.mjs"
   },
@@ -44,8 +50,8 @@
     "@release-it/bumper": "7.0.5",
     "@types/node": "24.12.0",
     "@types/picomatch": "4.0.2",
-    "commit-and-tag-version": "12.7.0",
-    "knip": "5.87.0",
+    "commit-and-tag-version": "12.7.1",
+    "knip": "6.0.3",
     "lefthook": "2.1.4",
     "oxfmt": "0.41.0",
     "oxlint": "1.56.0",
@@ -54,7 +60,7 @@
     "tsdown": "0.21.4",
     "typescript": "5.9.3",
     "vitest": "4.1.0",
-    "@bensandee/config": "0.9.1"
+    "@bensandee/config": "0.9.2"
   },
   "scripts": {
     "build": "tsdown",

package/tooling.schema.json

@@ -134,8 +134,11 @@
               }
             },
             "buildCommand": {
-              "description": "Command to build images before checking",
-              "type": "string"
+              "description": "Command to build images before checking (e.g. [\"pnpm\", \"image:build\"])",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             },
             "buildCwd": {
               "description": "Working directory for build command",
@@ -157,6 +160,14 @@
           "additionalProperties": false
         }
       ]
+    },
+    "registryHost": {
+      "description": "Docker registry hostname (e.g. ghcr.io, code.example.com)",
+      "type": "string"
+    },
+    "registryNamespace": {
+      "description": "Docker registry namespace (e.g. ghcr.io/myorg, code.example.com/myorg)",
+      "type": "string"
     }
   },
   "additionalProperties": false