buncargo 1.0.29 → 3.2.0

package/src/docker-compose/yaml.ts

@@ -0,0 +1,88 @@
+import type { DockerComposeNode } from "../types";
+import type { ComposeDocument } from "./model";
+
+function isObject(
+	value: DockerComposeNode,
+): value is Record<string, DockerComposeNode | undefined> {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function formatScalar(value: string | number | boolean | null): string {
+	if (value === null) return "null";
+	if (typeof value === "string") {
+		return JSON.stringify(value);
+	}
+	return String(value);
+}
+
+function formatKey(key: string): string {
+	return /^[A-Za-z_][A-Za-z0-9_-]*$/.test(key) ? key : JSON.stringify(key);
+}
+
+function sortNode(node: DockerComposeNode): DockerComposeNode {
+	if (Array.isArray(node)) {
+		return node.map(sortNode);
+	}
+	if (isObject(node)) {
+		const sorted: Record<string, DockerComposeNode | undefined> = {};
+		for (const key of Object.keys(node).sort()) {
+			const value = node[key];
+			if (value !== undefined) {
+				sorted[key] = sortNode(value);
+			}
+		}
+		return sorted;
+	}
+	return node;
+}
+
+function stringifyNode(node: DockerComposeNode, indent = 0): string {
+	const prefix = " ".repeat(indent);
+
+	if (
+		typeof node === "string" ||
+		typeof node === "number" ||
+		typeof node === "boolean" ||
+		node === null
+	) {
+		return `${prefix}${formatScalar(node)}`;
+	}
+
+	if (Array.isArray(node)) {
+		if (node.length === 0) return `${prefix}[]`;
+		return node
+			.map((item) => {
+				const isNested = typeof item === "object" && item !== null;
+				if (!isNested) {
+					return `${prefix}- ${formatScalar(
+						item as string | number | boolean | null,
+					)}`;
+				}
+				return `${prefix}-\n${stringifyNode(item, indent + 2)}`;
+			})
+			.join("\n");
+	}
+
+	const entries = Object.entries(node).filter(
+		([, value]) => value !== undefined,
+	) as Array<[string, DockerComposeNode]>;
+	if (entries.length === 0) return `${prefix}{}`;
+
+	return entries
+		.map(([key, value]) => {
+			const formattedKey = formatKey(key);
+			const isNested = typeof value === "object" && value !== null;
+			if (!isNested) {
+				return `${prefix}${formattedKey}: ${formatScalar(
+					value as string | number | boolean | null,
+				)}`;
+			}
+			return `${prefix}${formattedKey}:\n${stringifyNode(value, indent + 2)}`;
+		})
+		.join("\n");
+}
+
+export function composeToYaml(document: ComposeDocument): string {
+	const sorted = sortNode(document as DockerComposeNode);
+	return `${stringifyNode(sorted)}\n`;
+}

package/{environment.ts → src/environment/create-dev-environment.ts}

@@ -1,72 +1,61 @@
-import pc from "picocolors";
-import { assertValidConfig } from "./config";
-import {
-	areContainersRunning,
-	startContainers,
-	stopContainers,
-} from "./core/docker";
-import { getLocalIp, waitForDevServers, waitForServer } from "./core/network";
+import { assertValidConfig } from "../config";
+import { getLocalIp, waitForDevServers, waitForServer } from "../core/network";
 import {
 	computeDevIdentity,
 	computePorts,
 	computeUrls,
 	findMonorepoRoot,
-} from "./core/ports";
+} from "../core/ports";
 import {
 	buildApps,
 	execAsync,
 	startDevServers,
 	stopProcess as stopProcessFn,
-} from "./core/process";
-import { isCI as isCIEnv, logExpoApiUrl, logFrontendPort } from "./core/utils";
+} from "../core/process";
+import {
+	type PublicTunnel,
+	resolveExposeTargets,
+	startPublicTunnels,
+	stopPublicTunnels,
+} from "../core/tunnel";
+import { isCI as isCIEnv, logExpoApiUrl, logFrontendPort } from "../core/utils";
 import {
 	spawnWatchdog as spawnWatchdogFn,
 	startHeartbeat as startHeartbeatFn,
 	stopHeartbeat as stopHeartbeatFn,
 	stopWatchdog as stopWatchdogFn,
-} from "./core/watchdog";
-import { createPrismaRunner } from "./prisma";
+} from "../core/watchdog";
+import {
+	areContainersRunning,
+	startContainers,
+	stopContainers,
+} from "../docker/runtime";
+import {
+	getGeneratedComposePath,
+	writeGeneratedComposeFile,
+} from "../docker-compose";
+import { createPrismaRunner } from "../prisma";
 import type {
 	AppConfig,
 	ComputedPorts,
+	ComputedPublicUrls,
 	ComputedUrls,
 	DevConfig,
 	DevEnvironment,
+	DevEnvironmentTunnelLog,
 	DevServerPids,
 	ExecOptions,
 	HookContext,
+	OpenPublicTunnelsOptions,
+	OpenPublicTunnelsResult,
 	PrismaRunner,
 	ServiceConfig,
 	StartOptions,
 	StopOptions,
-} from "./types";
-
-// ═══════════════════════════════════════════════════════════════════════════
-// Console Output Formatting (Vite-inspired)
-// ═══════════════════════════════════════════════════════════════════════════
-
-/**
- * Format a URL with colored port number (Vite-style).
- */
-function formatUrl(url: string): string {
-	return pc.cyan(
-		url.replace(/:(\d+)(\/?)/, (_, port, slash) => `:${pc.bold(port)}${slash}`),
-	);
-}
-
-/**
- * Format a label with arrow prefix (Vite-style).
- */
-function formatLabel(label: string, value: string, arrow = "➜"): string {
-	return `  ${pc.green(arrow)}  ${pc.bold(label.padEnd(10))} ${value}`;
-}
-
-/**
- * Format a dim label (for secondary info).
- */
-function formatDimLabel(label: string, value: string): string {
-	return `  ${pc.dim("•")}  ${pc.dim(label.padEnd(10))} ${pc.dim(value)}`;
-}
+} from "../types";
+import { logEnvironmentInfo } from "./logging";
+import { assertOnlyAppNames, pickApps } from "./only-apps";
+import { createCheckTableHelper, createSeedCheckContext } from "./seeding";
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Environment Factory
@@ -115,6 +104,14 @@ export function createDevEnvironment<
 
 	const services = config.services;
 	const apps = (config.apps ?? {}) as TApps;
+	const composeFile = getGeneratedComposePath(
+		root,
+		config.docker,
+	).composeFileArg;
+
+	function ensureComposeFile(): string {
+		return writeGeneratedComposeFile(root, services, config.docker);
+	}
 
 	// Compute ports and URLs
 	const ports = computePorts(services, apps, portOffset) as ComputedPorts<
@@ -125,6 +122,22 @@ export function createDevEnvironment<
 		TServices,
 		TApps
 	>;
+	const publicUrls: Record<string, string> = {};
+
+	function setPublicUrls(urlsInput: Record<string, string>): void {
+		for (const key of Object.keys(publicUrls)) {
+			delete publicUrls[key];
+		}
+		for (const [key, value] of Object.entries(urlsInput)) {
+			publicUrls[key] = value;
+		}
+	}
+
+	function clearPublicUrls(): void {
+		for (const key of Object.keys(publicUrls)) {
+			delete publicUrls[key];
+		}
+	}
 
 	// Build environment variables
 	function buildEnvVars(production = false): Record<string, string> {
@@ -145,12 +158,19 @@ export function createDevEnvironment<
 			baseEnv[envName] = url;
 		}
 
+		// Add public URL environment variables when tunnels are active
+		for (const [name, url] of Object.entries(publicUrls)) {
+			const envName = `${name.toUpperCase()}_PUBLIC_URL`;
+			baseEnv[envName] = url;
+		}
+
 		// Call user's envVars function if provided
 		if (config.envVars) {
 			const userEnv = config.envVars(ports, urls, {
 				projectName,
 				localIp,
 				portOffset,
+				publicUrls: publicUrls as ComputedPublicUrls<TServices, TApps>,
 			});
 			for (const [key, value] of Object.entries(userEnv)) {
 				baseEnv[key] = String(value);
@@ -169,6 +189,7 @@ export function createDevEnvironment<
 				projectName,
 				ports,
 				urls,
+				publicUrls: publicUrls as ComputedPublicUrls<TServices, TApps>,
 				root,
 				isCI: isCIEnv(),
 				portOffset,
@@ -202,12 +223,18 @@ export function createDevEnvironment<
 			startServers: shouldStartServers = true,
 			productionBuild = isCI,
 			skipSeed = false,
+			skipEnvironmentLog = false,
+			onlyApps,
 		} = startOptions;
 
+		assertOnlyAppNames(Object.keys(apps), onlyApps);
+		const appsToStart = pickApps(apps, onlyApps);
+
 		const envVars = buildEnvVars(productionBuild);
+		ensureComposeFile();
 
 		// Log environment info
-		if (verbose) {
+		if (verbose && !skipEnvironmentLog) {
 			logInfo(productionBuild ? "Production Environment" : "Dev Environment");
 		}
 
@@ -224,7 +251,7 @@ export function createDevEnvironment<
 			startContainers(root, projectName, envVars, {
 				verbose,
 				wait,
-				composeFile: config.options?.composeFile,
+				composeFile,
 			});
 		}
 
@@ -258,19 +285,19 @@ export function createDevEnvironment<
 				}),
 			);
 
-		// Check for failures
-		for (const { name, result } of migrationResults) {
-			if (result.exitCode !== 0) {
-				console.error(`❌ Migration "${name}" failed`);
-				if (result.stdout) {
-					console.error(result.stdout);
-				}
-				if (result.stderr) {
-					console.error(result.stderr);
+			// Check for failures
+			for (const { name, result } of migrationResults) {
+				if (result.exitCode !== 0) {
+					console.error(`❌ Migration "${name}" failed`);
+					if (result.stdout) {
+						console.error(result.stdout);
+					}
+					if (result.stderr) {
+						console.error(result.stderr);
+					}
+					throw new Error(`Migration "${name}" failed`);
 				}
-				throw new Error(`Migration "${name}" failed`);
 			}
-		}
 
 			if (verbose) console.log("✓ Migrations complete");
 		}
@@ -286,35 +313,14 @@ export function createDevEnvironment<
 
 			// Check if seeding is needed using check function
 			if (config.seed.check) {
-				// Create checkTable helper function with typed service parameter
-				const checkTable = async (
-					tableName: string,
-					service?: keyof TServices,
-				): Promise<boolean> => {
-					const serviceName = (service ?? "postgres") as string;
-					const serviceUrl = (urls as Record<string, string>)[serviceName];
-					if (!serviceUrl) {
-						console.warn(`⚠️ Service "${serviceName}" not found for checkTable`);
-						return true; // Default to seeding if service not found
-					}
-				const checkResult = await exec(
-					`psql "${serviceUrl}" -tAc 'SELECT COUNT(*) FROM "${tableName}" LIMIT 1'`,
-					{ throwOnError: false },
+				const checkTable = createCheckTableHelper<TServices, TApps>(
+					urls as Record<string, string>,
+					exec,
 				);
-				const count = checkResult.stdout.trim();
-				const shouldSeed = checkResult.exitCode !== 0 || count === "0" || count === "";
-				if (!shouldSeed) {
-					console.log(`  📊 Table "${tableName}" has ${count} rows`);
-				}
-				return shouldSeed;
-				};
-
-				// Build seed check context with helpers
-				const seedCheckContext = {
-					...getHookContext(),
+				const seedCheckContext = createSeedCheckContext(
+					getHookContext(),
 					checkTable,
-				};
-
+				);
 				shouldSeed = await config.seed.check(seedCheckContext);
 			}
 
@@ -339,7 +345,7 @@ export function createDevEnvironment<
 		}
 
 		// Start servers if requested
-		if (shouldStartServers && Object.keys(apps).length > 0) {
+		if (shouldStartServers && Object.keys(appsToStart).length > 0) {
 			// Run beforeServers hook
 			if (config.hooks?.beforeServers) {
 				await config.hooks.beforeServers(getHookContext());
@@ -347,11 +353,11 @@ export function createDevEnvironment<
 
 			// Build if production
 			if (productionBuild) {
-				buildApps(apps, root, envVars, { verbose });
+				buildApps(appsToStart, root, envVars, { verbose });
 			}
 
 			// Start servers
-			const pids = await startDevServers(apps, root, envVars, ports, {
+			const pids = await startDevServers(appsToStart, root, envVars, ports, {
 				verbose,
 				productionBuild,
 				isCI,
@@ -359,7 +365,7 @@ export function createDevEnvironment<
 
 			// Wait for servers to be ready
 			if (verbose) console.log("⏳ Waiting for servers to be ready...");
-			await waitForDevServers(apps, ports, {
+			await waitForDevServers(appsToStart, ports, {
 				timeout: isCI ? 120000 : 60000,
 				verbose,
 				productionBuild,
@@ -380,6 +386,7 @@ export function createDevEnvironment<
 
 	async function stop(stopOptions: StopOptions = {}): Promise<void> {
 		const { verbose = true, removeVolumes = false } = stopOptions;
+		ensureComposeFile();
 
 		// Run beforeStop hook
 		if (config.hooks?.beforeStop) {
@@ -389,7 +396,7 @@ export function createDevEnvironment<
 		stopContainers(root, projectName, {
 			verbose,
 			removeVolumes,
-			composeFile: config.options?.composeFile,
+			composeFile,
 		});
 	}
 
@@ -408,84 +415,141 @@ export function createDevEnvironment<
 	// ─────────────────────────────────────────────────────────────────────────
 
 	async function startServersOnly(
-		options: { productionBuild?: boolean; verbose?: boolean } = {},
+		options: {
+			productionBuild?: boolean;
+			verbose?: boolean;
+			onlyApps?: string[];
+		} = {},
 	): Promise<DevServerPids> {
-		const { productionBuild = false, verbose = true } = options;
+		const { productionBuild = false, verbose = true, onlyApps } = options;
+		assertOnlyAppNames(Object.keys(apps), onlyApps);
+		const appsToStart = pickApps(apps, onlyApps);
 		const envVars = buildEnvVars(productionBuild);
 		const isCI = process.env.CI === "true";
 
+		if (Object.keys(appsToStart).length === 0) {
+			return {};
+		}
+
 		// Build if production
 		if (productionBuild) {
-			buildApps(apps, root, envVars, { verbose });
+			buildApps(appsToStart, root, envVars, { verbose });
 		}
 
-		return startDevServers(apps, root, envVars, ports, {
+		const pids = await startDevServers(appsToStart, root, envVars, ports, {
 			verbose,
 			productionBuild,
 			isCI,
 		});
+
+		if (verbose) console.log("⏳ Waiting for servers to be ready...");
+		await waitForDevServers(appsToStart, ports, {
+			timeout: isCI ? 120000 : 60000,
+			verbose,
+			productionBuild,
+		});
+
+		return pids;
 	}
 
 	async function waitForServersReady(
-		options: { timeout?: number; productionBuild?: boolean } = {},
+		options: {
+			timeout?: number;
+			productionBuild?: boolean;
+			onlyApps?: string[];
+		} = {},
 	): Promise<void> {
-		const { timeout = 60000, productionBuild = false } = options;
-		await waitForDevServers(apps, ports, { timeout, productionBuild });
+		const { timeout = 60000, productionBuild = false, onlyApps } = options;
+		assertOnlyAppNames(Object.keys(apps), onlyApps);
+		const appsToWait = pickApps(apps, onlyApps);
+		await waitForDevServers(appsToWait, ports, { timeout, productionBuild });
 	}
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Utilities
-	// ─────────────────────────────────────────────────────────────────────────
-
-	function logInfo(label = "Docker Dev"): void {
-		const serviceNames = Object.keys(services);
-		const appNames = Object.keys(apps);
-
-		console.log("");
-		console.log(`  ${pc.cyan(pc.bold(`🐳 ${label}`))}`);
-		console.log(formatLabel("Project:", pc.white(projectName)));
-
-		// Services section (Docker containers)
-		if (serviceNames.length > 0) {
-			console.log("");
-			console.log(`  ${pc.dim("─── Services ───")}`);
-			for (const name of serviceNames) {
-				const port = (ports as Record<string, number>)[name];
-				const url = `localhost:${port}`;
-				console.log(formatLabel(`${name}:`, formatUrl(`http://${url}`)));
-			}
+	async function openPublicTunnels(
+		options: OpenPublicTunnelsOptions = {},
+	): Promise<OpenPublicTunnelsResult<TServices, TApps>> {
+		const { names, waitForHealthy } = options;
+		const exposeList = names?.length ? names.join(",") : undefined;
+
+		if (waitForHealthy?.length) {
+			assertOnlyAppNames(Object.keys(apps), waitForHealthy);
+			const appsWait = pickApps(apps, waitForHealthy);
+			const isCI = process.env.CI === "true";
+			await waitForDevServers(appsWait, ports, {
+				timeout: isCI ? 120000 : 60000,
+				verbose: config.options?.verbose ?? true,
+				productionBuild: false,
+			});
 		}
 
-		// Apps section (Dev servers)
-		if (appNames.length > 0) {
-			console.log("");
-			console.log(`  ${pc.dim("─── Applications ───")}`);
-			for (const name of appNames) {
-				const port = (ports as Record<string, number>)[name];
-				const localUrl = `http://localhost:${port}`;
-				const networkUrl = `http://${localIp}:${port}`;
-
-				console.log(`  ${pc.green("➜")}  ${pc.bold(pc.cyan(name))}`);
-				console.log(`       ${pc.dim("Local:")}   ${formatUrl(localUrl)}`);
-				console.log(`       ${pc.dim("Network:")} ${formatUrl(networkUrl)}`);
-			}
+		const { targets, unknownNames, notEnabledNames } = resolveExposeTargets(
+			{
+				services,
+				apps,
+				ports,
+			} as DevEnvironment<TServices, TApps>,
+			exposeList,
+		);
+
+		if (unknownNames.length > 0) {
+			throw new Error(`Unknown expose target(s): ${unknownNames.join(", ")}`);
+		}
+		if (notEnabledNames.length > 0) {
+			throw new Error(
+				`Target(s) missing expose: true: ${notEnabledNames.join(", ")}`,
+			);
+		}
+		if (targets.length === 0) {
+			throw new Error(
+				"No expose targets selected. Add expose: true to services/apps or pass names that have expose: true.",
+			);
 		}
 
-		// Environment info
-		console.log("");
-		console.log(`  ${pc.dim("─── Environment ───")}`);
-		console.log(formatDimLabel("Worktree:", worktree ? "yes" : "no"));
-		console.log(
-			formatDimLabel(
-				"Port offset:",
-				portOffset > 0 ? `+${portOffset}` : "none",
-			),
+		const tunnels = await startPublicTunnels(targets);
+		setPublicUrls(
+			Object.fromEntries(tunnels.map((t) => [t.name, t.publicUrl])),
 		);
-		if (projectSuffix) {
-			console.log(formatDimLabel("Suffix:", projectSuffix));
+
+		let closed = false;
+		async function close(): Promise<void> {
+			if (closed) return;
+			closed = true;
+			await stopPublicTunnels(tunnels);
+			clearPublicUrls();
 		}
-		console.log(formatDimLabel("Local IP:", localIp));
-		console.log("");
+
+		return {
+			publicUrls: { ...publicUrls } as ComputedPublicUrls<TServices, TApps>,
+			tunnels,
+			close,
+		};
+	}
+
+	// ─────────────────────────────────────────────────────────────────────────
+	// Utilities
+	// ─────────────────────────────────────────────────────────────────────────
+
+	function logInfo(label = "Docker Dev", tunnels?: PublicTunnel[]): void {
+		const tunnelRows: DevEnvironmentTunnelLog[] | undefined = tunnels?.map(
+			({ kind, name, localUrl, publicUrl }) => ({
+				kind,
+				name,
+				localUrl,
+				publicUrl,
+			}),
+		);
+		logEnvironmentInfo({
+			label,
+			projectName,
+			services,
+			apps,
+			ports: ports as Record<string, number>,
+			localIp,
+			worktree,
+			portOffset,
+			projectSuffix,
+			tunnels: tunnelRows,
+		});
 	}
 
 	async function waitForServerUrl(
@@ -511,7 +575,7 @@ export function createDevEnvironment<
 		await spawnWatchdogFn(projectName, root, {
 			timeoutMinutes,
 			verbose: true,
-			composeFile: config.options?.composeFile,
+			composeFile,
 		});
 	}
 
@@ -554,11 +618,14 @@ export function createDevEnvironment<
 		projectName,
 		ports,
 		urls,
+		publicUrls: publicUrls as ComputedPublicUrls<TServices, TApps>,
+		services,
 		apps,
 		portOffset,
 		isWorktree: worktree,
 		localIp,
 		root,
+		composeFile,
 
 		// Container management
 		start,
@@ -573,9 +640,15 @@ export function createDevEnvironment<
 
 		// Utilities
 		buildEnvVars,
+		setPublicUrls: (urlsInput) => {
+			setPublicUrls(urlsInput as Record<string, string>);
+		},
+		clearPublicUrls,
+		ensureComposeFile,
 		exec,
 		waitForServer: waitForServerUrl,
 		logInfo,
+		openPublicTunnels,
 
 		// Vibe Kanban Integration
 		getExpoApiUrl,

package/src/environment/index.ts

@@ -0,0 +1 @@
+export { createDevEnvironment } from "./create-dev-environment";