buncargo 1.0.29 → 3.0.0

package/dist/index-zfjzzjkf.js

@@ -1,225 +1,266 @@
-import {
-  sleep
-} from "./index-8xj2p5n5.js";
-
 // core/docker.ts
 import { execSync } from "node:child_process";
+import { sleep } from "./index-8xj2p5n5.js";
+
 var POLL_INTERVAL = 250;
 var MAX_ATTEMPTS = 120;
-var DOCKER_NOT_RUNNING_MESSAGE = "Docker is not running. Please start Docker and try again.";
+var DOCKER_NOT_RUNNING_MESSAGE =
+	"Docker is not running. Please start Docker and try again.";
 async function isContainerRunning(project, service) {
-  try {
-    const result = execSync(`docker ps --filter "label=com.docker.compose.project=${project}" --filter "label=com.docker.compose.service=${service}" --format "{{.State}}"`, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
-    return result.trim() === "running";
-  } catch {
-    return false;
-  }
+	try {
+		const result = execSync(
+			`docker ps --filter "label=com.docker.compose.project=${project}" --filter "label=com.docker.compose.service=${service}" --format "{{.State}}"`,
+			{ encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] },
+		);
+		return result.trim() === "running";
+	} catch {
+		return false;
+	}
 }
 function isDockerRunning() {
-  try {
-    execSync('docker info --format "{{.ServerVersion}}"', {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    return true;
-  } catch {
-    return false;
-  }
+	try {
+		execSync('docker info --format "{{.ServerVersion}}"', {
+			encoding: "utf-8",
+			stdio: ["pipe", "pipe", "pipe"],
+		});
+		return true;
+	} catch {
+		return false;
+	}
 }
 function assertDockerRunning() {
-  if (!isDockerRunning()) {
-    throw new Error(DOCKER_NOT_RUNNING_MESSAGE);
-  }
+	if (!isDockerRunning()) {
+		throw new Error(DOCKER_NOT_RUNNING_MESSAGE);
+	}
 }
 async function areContainersRunning(project, minCount = 1) {
-  try {
-    const result = execSync(`docker ps --filter "label=com.docker.compose.project=${project}" --format "{{.State}}"`, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
-    const states = result.trim().split(`
-`).filter(Boolean);
-    if (states.length < minCount)
-      return false;
-    return states.every((state) => state === "running");
-  } catch {
-    return false;
-  }
+	try {
+		const result = execSync(
+			`docker ps --filter "label=com.docker.compose.project=${project}" --format "{{.State}}"`,
+			{ encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] },
+		);
+		const states = result
+			.trim()
+			.split(`
+`)
+			.filter(Boolean);
+		if (states.length < minCount) return false;
+		return states.every((state) => state === "running");
+	} catch {
+		return false;
+	}
 }
 function startContainers(root, projectName, envVars, options = {}) {
-  const { verbose = true, wait = true, composeFile } = options;
-  assertDockerRunning();
-  if (verbose)
-    console.log("\uD83D\uDC33 Starting Docker containers...");
-  const composeArg = composeFile ? `-f ${composeFile}` : "";
-  const waitFlag = wait ? "--wait" : "";
-  const cmd = `docker compose ${composeArg} up -d ${waitFlag}`.trim();
-  execSync(cmd, {
-    cwd: root,
-    env: { ...process.env, ...envVars, COMPOSE_PROJECT_NAME: projectName },
-    stdio: verbose ? "inherit" : "ignore"
-  });
-  if (verbose)
-    console.log("✓ Containers started");
+	const { verbose = true, wait = true, composeFile } = options;
+	assertDockerRunning();
+	if (verbose) console.log("\uD83D\uDC33 Starting Docker containers...");
+	const composeArg = composeFile ? `-f ${composeFile}` : "";
+	const waitFlag = wait ? "--wait" : "";
+	const cmd = `docker compose ${composeArg} up -d ${waitFlag}`.trim();
+	execSync(cmd, {
+		cwd: root,
+		env: { ...process.env, ...envVars, COMPOSE_PROJECT_NAME: projectName },
+		stdio: verbose ? "inherit" : "ignore",
+	});
+	if (verbose) console.log("✓ Containers started");
 }
 function stopContainers(root, projectName, options = {}) {
-  const { verbose = true, removeVolumes = false, composeFile } = options;
-  assertDockerRunning();
-  if (verbose) {
-    console.log(removeVolumes ? "\uD83D\uDDD1️  Stopping containers and removing volumes..." : "\uD83D\uDED1 Stopping containers...");
-  }
-  const composeArg = composeFile ? `-f ${composeFile}` : "";
-  const volumeFlag = removeVolumes ? "-v" : "";
-  const cmd = `docker compose ${composeArg} down ${volumeFlag}`.trim();
-  execSync(cmd, {
-    cwd: root,
-    env: { ...process.env, COMPOSE_PROJECT_NAME: projectName },
-    stdio: verbose ? "inherit" : "ignore"
-  });
-  if (verbose)
-    console.log("✓ Containers stopped");
+	const { verbose = true, removeVolumes = false, composeFile } = options;
+	assertDockerRunning();
+	if (verbose) {
+		console.log(
+			removeVolumes
+				? "\uD83D\uDDD1️  Stopping containers and removing volumes..."
+				: "\uD83D\uDED1 Stopping containers...",
+		);
+	}
+	const composeArg = composeFile ? `-f ${composeFile}` : "";
+	const volumeFlag = removeVolumes ? "-v" : "";
+	const cmd = `docker compose ${composeArg} down ${volumeFlag}`.trim();
+	execSync(cmd, {
+		cwd: root,
+		env: { ...process.env, COMPOSE_PROJECT_NAME: projectName },
+		stdio: verbose ? "inherit" : "ignore",
+	});
+	if (verbose) console.log("✓ Containers stopped");
 }
 function startService(root, projectName, serviceName, envVars, options = {}) {
-  const { verbose = true, composeFile } = options;
-  assertDockerRunning();
-  if (verbose)
-    console.log(`\uD83D\uDC33 Starting ${serviceName}...`);
-  const composeArg = composeFile ? `-f ${composeFile}` : "";
-  const cmd = `docker compose ${composeArg} up -d ${serviceName}`.trim();
-  execSync(cmd, {
-    cwd: root,
-    env: { ...process.env, ...envVars, COMPOSE_PROJECT_NAME: projectName },
-    stdio: verbose ? "inherit" : "ignore"
-  });
+	const { verbose = true, composeFile } = options;
+	assertDockerRunning();
+	if (verbose) console.log(`\uD83D\uDC33 Starting ${serviceName}...`);
+	const composeArg = composeFile ? `-f ${composeFile}` : "";
+	const cmd = `docker compose ${composeArg} up -d ${serviceName}`.trim();
+	execSync(cmd, {
+		cwd: root,
+		env: { ...process.env, ...envVars, COMPOSE_PROJECT_NAME: projectName },
+		stdio: verbose ? "inherit" : "ignore",
+	});
 }
 function createBuiltInHealthCheck(type, serviceName, context = {}) {
-  const { projectName, root } = context;
-  switch (type) {
-    case "pg_isready":
-      return async () => {
-        try {
-          const projectArg = projectName ? `-p ${projectName}` : "";
-          execSync(`docker compose ${projectArg} exec -T ${serviceName} pg_isready -U postgres`, {
-            cwd: root,
-            stdio: ["pipe", "pipe", "pipe"]
-          });
-          return true;
-        } catch {
-          return false;
-        }
-      };
-    case "redis-cli":
-      return async () => {
-        try {
-          const projectArg = projectName ? `-p ${projectName}` : "";
-          execSync(`docker compose ${projectArg} exec -T ${serviceName} redis-cli ping`, {
-            cwd: root,
-            stdio: ["pipe", "pipe", "pipe"]
-          });
-          return true;
-        } catch {
-          return false;
-        }
-      };
-    case "http":
-      return async (port) => {
-        try {
-          const controller = new AbortController;
-          const timeoutId = setTimeout(() => controller.abort(), 2000);
-          try {
-            const response = await fetch(`http://localhost:${port}/`, {
-              signal: controller.signal
-            });
-            clearTimeout(timeoutId);
-            return response.ok || response.status === 404;
-          } catch {
-            clearTimeout(timeoutId);
-            return false;
-          }
-        } catch {
-          return false;
-        }
-      };
-    case "tcp":
-      return async (port) => {
-        try {
-          const controller = new AbortController;
-          const timeoutId = setTimeout(() => controller.abort(), 1000);
-          try {
-            await fetch(`http://localhost:${port}/`, {
-              signal: controller.signal
-            });
-            clearTimeout(timeoutId);
-            return true;
-          } catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof Error && error.message.includes("ECONNREFUSED")) {
-              return false;
-            }
-            return true;
-          }
-        } catch {
-          return false;
-        }
-      };
-    default:
-      return async () => true;
-  }
+	const { projectName, root } = context;
+	switch (type) {
+		case "pg_isready":
+			return async () => {
+				try {
+					const projectArg = projectName ? `-p ${projectName}` : "";
+					execSync(
+						`docker compose ${projectArg} exec -T ${serviceName} pg_isready -U postgres`,
+						{
+							cwd: root,
+							stdio: ["pipe", "pipe", "pipe"],
+						},
+					);
+					return true;
+				} catch {
+					return false;
+				}
+			};
+		case "redis-cli":
+			return async () => {
+				try {
+					const projectArg = projectName ? `-p ${projectName}` : "";
+					execSync(
+						`docker compose ${projectArg} exec -T ${serviceName} redis-cli ping`,
+						{
+							cwd: root,
+							stdio: ["pipe", "pipe", "pipe"],
+						},
+					);
+					return true;
+				} catch {
+					return false;
+				}
+			};
+		case "http":
+			return async (port) => {
+				try {
+					const controller = new AbortController();
+					const timeoutId = setTimeout(() => controller.abort(), 2000);
+					try {
+						const response = await fetch(`http://localhost:${port}/`, {
+							signal: controller.signal,
+						});
+						clearTimeout(timeoutId);
+						return response.ok || response.status === 404;
+					} catch {
+						clearTimeout(timeoutId);
+						return false;
+					}
+				} catch {
+					return false;
+				}
+			};
+		case "tcp":
+			return async (port) => {
+				try {
+					const controller = new AbortController();
+					const timeoutId = setTimeout(() => controller.abort(), 1000);
+					try {
+						await fetch(`http://localhost:${port}/`, {
+							signal: controller.signal,
+						});
+						clearTimeout(timeoutId);
+						return true;
+					} catch (error) {
+						clearTimeout(timeoutId);
+						if (
+							error instanceof Error &&
+							error.message.includes("ECONNREFUSED")
+						) {
+							return false;
+						}
+						return true;
+					}
+				} catch {
+					return false;
+				}
+			};
+		default:
+			return async () => true;
+	}
 }
 async function waitForService(serviceName, config, port, options = {}) {
-  const {
-    maxAttempts = MAX_ATTEMPTS,
-    pollInterval = POLL_INTERVAL,
-    projectName,
-    root
-  } = options;
-  if (config.healthCheck === false || config.healthCheck === undefined) {
-    return;
-  }
-  const healthCheckFn = typeof config.healthCheck === "function" ? config.healthCheck : createBuiltInHealthCheck(config.healthCheck, config.serviceName ?? serviceName, { projectName, root });
-  for (let i = 0;i < maxAttempts; i++) {
-    const isHealthy = await healthCheckFn(port);
-    if (isHealthy)
-      return;
-    await sleep(pollInterval);
-  }
-  throw new Error(`Service ${serviceName} did not become ready in time`);
+	const {
+		maxAttempts = MAX_ATTEMPTS,
+		pollInterval = POLL_INTERVAL,
+		projectName,
+		root,
+	} = options;
+	if (config.healthCheck === false || config.healthCheck === undefined) {
+		return;
+	}
+	const healthCheckFn =
+		typeof config.healthCheck === "function"
+			? config.healthCheck
+			: createBuiltInHealthCheck(
+					config.healthCheck,
+					config.serviceName ?? serviceName,
+					{ projectName, root },
+				);
+	for (let i = 0; i < maxAttempts; i++) {
+		const isHealthy = await healthCheckFn(port);
+		if (isHealthy) return;
+		await sleep(pollInterval);
+	}
+	throw new Error(`Service ${serviceName} did not become ready in time`);
 }
 async function waitForAllServices(services, ports, options = {}) {
-  const { verbose = true, ...waitOptions } = options;
-  if (verbose)
-    console.log("⏳ Waiting for services to be healthy...");
-  const promises = Object.entries(services).map(([name, config]) => {
-    const port = ports[name];
-    if (port === undefined) {
-      console.warn(`⚠️  No port found for service ${name}, skipping health check`);
-      return Promise.resolve();
-    }
-    return waitForService(name, config, port, waitOptions);
-  });
-  await Promise.all(promises);
-  if (verbose)
-    console.log("✓ All services healthy");
+	const { verbose = true, ...waitOptions } = options;
+	if (verbose) console.log("⏳ Waiting for services to be healthy...");
+	const promises = Object.entries(services).map(([name, config]) => {
+		const port = ports[name];
+		if (port === undefined) {
+			console.warn(
+				`⚠️  No port found for service ${name}, skipping health check`,
+			);
+			return Promise.resolve();
+		}
+		return waitForService(name, config, port, waitOptions);
+	});
+	await Promise.all(promises);
+	if (verbose) console.log("✓ All services healthy");
 }
-async function waitForServiceByType(serviceName, healthCheckType, port, options = {}) {
-  const {
-    maxAttempts = MAX_ATTEMPTS,
-    pollInterval = POLL_INTERVAL,
-    verbose = false,
-    projectName,
-    root
-  } = options;
-  const healthCheckFn = createBuiltInHealthCheck(healthCheckType, serviceName, {
-    projectName,
-    root
-  });
-  for (let i = 0;i < maxAttempts; i++) {
-    const isHealthy = await healthCheckFn(port);
-    if (isHealthy) {
-      if (verbose)
-        console.log(`✓ ${serviceName} is ready`);
-      return;
-    }
-    await sleep(pollInterval);
-  }
-  throw new Error(`Service ${serviceName} did not become ready in time`);
+async function waitForServiceByType(
+	serviceName,
+	healthCheckType,
+	port,
+	options = {},
+) {
+	const {
+		maxAttempts = MAX_ATTEMPTS,
+		pollInterval = POLL_INTERVAL,
+		verbose = false,
+		projectName,
+		root,
+	} = options;
+	const healthCheckFn = createBuiltInHealthCheck(healthCheckType, serviceName, {
+		projectName,
+		root,
+	});
+	for (let i = 0; i < maxAttempts; i++) {
+		const isHealthy = await healthCheckFn(port);
+		if (isHealthy) {
+			if (verbose) console.log(`✓ ${serviceName} is ready`);
+			return;
+		}
+		await sleep(pollInterval);
+	}
+	throw new Error(`Service ${serviceName} did not become ready in time`);
 }
 
-export { POLL_INTERVAL, MAX_ATTEMPTS, DOCKER_NOT_RUNNING_MESSAGE, isContainerRunning, isDockerRunning, assertDockerRunning, areContainersRunning, startContainers, stopContainers, startService, createBuiltInHealthCheck, waitForService, waitForAllServices, waitForServiceByType };
+export {
+	POLL_INTERVAL,
+	MAX_ATTEMPTS,
+	DOCKER_NOT_RUNNING_MESSAGE,
+	isContainerRunning,
+	isDockerRunning,
+	assertDockerRunning,
+	areContainersRunning,
+	startContainers,
+	stopContainers,
+	startService,
+	createBuiltInHealthCheck,
+	waitForService,
+	waitForAllServices,
+	waitForServiceByType,
+};

package/dist/index.d.ts

@@ -1,12 +1,16 @@
-export { getFlagValue, hasFlag, runCli } from "./cli";
-export { assertValidConfig, defineDevConfig, mergeConfigs, validateConfig, } from "./config";
-export { createDevEnvironment } from "./environment";
-export { runWorkspaceTypecheck, type TypecheckResult, type WorkspaceTypecheckOptions, type WorkspaceTypecheckResult, } from "./lint";
-export { clearDevEnvCache, getDevEnv, loadDevEnv } from "./loader";
-export type { AppConfig, BuiltInHealthCheck, CliOptions, ComputedPorts, ComputedUrls, DevConfig, DevEnvironment, DevHooks, DevOptions, DevServerPids, EnvVarsBuilder, ExecOptions, HealthCheckFn, HookContext, MigrationConfig, PrismaConfig, PrismaRunner, SeedCheckContext, SeedCheckHelpers, SeedConfig, ServiceConfig, StartOptions, StopOptions, UrlBuilderContext, UrlBuilderFn, } from "./types";
-export { areContainersRunning, assertDockerRunning, DOCKER_NOT_RUNNING_MESSAGE, isContainerRunning, isDockerRunning, MAX_ATTEMPTS, POLL_INTERVAL, } from "./core/docker";
+export { getFlagValue, hasFlag, runCli } from "./cli/run-cli";
+export { assertValidConfig, defineDevConfig, mergeConfigs, validateConfig, } from "./config/index";
+export type { ClickhouseServiceOptions, CustomServiceOptions, PostgresServiceOptions, RedisServiceOptions, } from "./docker-compose/services";
+export { service } from "./docker-compose/services";
+export { createDevEnvironment } from "./environment/index";
+export { clearDevEnvCache, getDevEnv, loadDevEnv } from "./loader/index";
+export { runWorkspaceTypecheck, type TypecheckResult, type WorkspaceTypecheckOptions, type WorkspaceTypecheckResult, } from "./typecheck/index";
+export type { AppConfig, BuiltInHealthCheck, CliOptions, ComputedPorts, ComputedPublicUrls, ComputedUrls, DevConfig, DevEnvironment, DevHooks, DevOptions, DevServerPids, DockerComposeGenerationOptions, DockerComposeHealthcheckRaw, DockerComposeNode, DockerComposeServiceRaw, DockerComposeVolumeRaw, DockerPresetName, DockerPresetServiceDefinition, DockerServiceDefinition, EnvVarsBuilder, ExecOptions, HealthCheckFn, HookContext, MigrationConfig, PrismaConfig, PrismaRunner, SeedCheckContext, SeedCheckHelpers, SeedConfig, ServiceConfig, StartOptions, StopOptions, UrlBuilderContext, UrlBuilderFn, } from "./types/index";
 export { getLocalIp, isPortAvailable, waitForServer } from "./core/network";
-export { computeDevIdentity, calculatePortOffset, findMonorepoRoot, getProjectName, getWorktreeProjectSuffix, getWorktreeName, isWorktree, } from "./core/ports";
+export { calculatePortOffset, computeDevIdentity, findMonorepoRoot, getProjectName, getWorktreeName, getWorktreeProjectSuffix, isWorktree, } from "./core/ports";
 export { getProcessOnPort, isPortInUse, isProcessAlive, killProcessesOnAppPorts, killProcessOnPort, killProcessOnPortAndWait, } from "./core/process";
+export { type PublicExposeTarget, type PublicTunnel, resolveExposeTargets, startPublicTunnels, stopPublicTunnels, } from "./core/tunnel";
 export { getEnvVar, isCI, logApiUrl, logExpoApiUrl, logFrontendPort, sleep, } from "./core/utils";
 export { getHeartbeatFile, getWatchdogPidFile, isWatchdogRunning, spawnWatchdog, startHeartbeat, stopHeartbeat, stopWatchdog, } from "./core/watchdog";
+export { areContainersRunning, assertDockerRunning, DOCKER_NOT_RUNNING_MESSAGE, isContainerRunning, isDockerRunning, MAX_ATTEMPTS, POLL_INTERVAL, } from "./docker/index";
+export { buildComposeModel, composeToYaml, DEFAULT_GENERATED_COMPOSE_FILE, getGeneratedComposePath, writeGeneratedComposeFile, } from "./docker-compose/index";

package/dist/index.js

@@ -1,43 +1,20 @@
+import"./index-bj79tw5w.js";
 import {
   getFlagValue,
   hasFlag,
-  runCli
-} from "./index-segbnm0h.js";
-import {
-  runWorkspaceTypecheck
-} from "./index-d9efy0n4.js";
+  resolveExposeTargets,
+  runCli,
+  startPublicTunnels,
+  stopPublicTunnels
+} from "./index-0kxnae3z.js";
 import {
   clearDevEnvCache,
   getDevEnv,
   loadDevEnv
-} from "./index-1mdrf7nz.js";
+} from "./index-4xrxh8yv.js";
 import {
   createDevEnvironment
-} from "./index-wk2na3t9.js";
-import {
-  getHeartbeatFile,
-  getWatchdogPidFile,
-  isWatchdogRunning,
-  spawnWatchdog,
-  startHeartbeat,
-  stopHeartbeat,
-  stopWatchdog
-} from "./index-ggq3yryx.js";
-import {
-  getProcessOnPort,
-  isPortInUse,
-  isProcessAlive,
-  killProcessOnPort,
-  killProcessOnPortAndWait,
-  killProcessesOnAppPorts
-} from "./index-1yvbwj4k.js";
-import {
-  assertValidConfig,
-  defineDevConfig,
-  mergeConfigs,
-  validateConfig
-} from "./index-tjqw9vtj.js";
-import"./index-qfphr2fd.js";
+} from "./index-ma6tgdb2.js";
 import {
   DOCKER_NOT_RUNNING_MESSAGE,
   MAX_ATTEMPTS,
@@ -46,7 +23,7 @@ import {
   assertDockerRunning,
   isContainerRunning,
   isDockerRunning
-} from "./index-zfjzzjkf.js";
+} from "./index-d8tyv5se.js";
 import {
   getEnvVar,
   getLocalIp,
@@ -57,7 +34,7 @@ import {
   logFrontendPort,
   sleep,
   waitForServer
-} from "./index-8xj2p5n5.js";
+} from "./index-c0dr6mcv.js";
 import {
   calculatePortOffset,
   computeDevIdentity,
@@ -66,18 +43,58 @@ import {
   getWorktreeName,
   getWorktreeProjectSuffix,
   isWorktree
-} from "./index-731rzzfp.js";
+} from "./index-fb29934k.js";
+import {
+  DEFAULT_GENERATED_COMPOSE_FILE,
+  buildComposeModel,
+  composeToYaml,
+  getGeneratedComposePath,
+  service,
+  writeGeneratedComposeFile
+} from "./index-5t9jxqm0.js";
+import"./index-bnk6nr0g.js";
+import {
+  getHeartbeatFile,
+  getWatchdogPidFile,
+  isWatchdogRunning,
+  spawnWatchdog,
+  startHeartbeat,
+  stopHeartbeat,
+  stopWatchdog
+} from "./index-mam0bcyz.js";
+import {
+  getProcessOnPort,
+  isPortInUse,
+  isProcessAlive,
+  killProcessOnPort,
+  killProcessOnPortAndWait,
+  killProcessesOnAppPorts
+} from "./index-mm412dkp.js";
+import {
+  assertValidConfig,
+  defineDevConfig,
+  mergeConfigs,
+  validateConfig
+} from "./index-t0fj6gg1.js";
+import {
+  runWorkspaceTypecheck
+} from "./index-h70tce00.js";
 import"./index-qnx9j3qa.js";
 export {
+  writeGeneratedComposeFile,
   waitForServer,
   validateConfig,
   stopWatchdog,
+  stopPublicTunnels,
   stopHeartbeat,
+  startPublicTunnels,
   startHeartbeat,
   spawnWatchdog,
   sleep,
+  service,
   runWorkspaceTypecheck,
   runCli,
+  resolveExposeTargets,
   mergeConfigs,
   logFrontendPort,
   logExpoApiUrl,
@@ -102,6 +119,7 @@ export {
   getProcessOnPort,
   getLocalIp,
   getHeartbeatFile,
+  getGeneratedComposePath,
   getFlagValue,
   getEnvVar,
   getDevEnv,
@@ -109,12 +127,15 @@ export {
   defineDevConfig,
   createDevEnvironment,
   computeDevIdentity,
+  composeToYaml,
   clearDevEnvCache,
   calculatePortOffset,
+  buildComposeModel,
   assertValidConfig,
   assertDockerRunning,
   areContainersRunning,
   POLL_INTERVAL,
   MAX_ATTEMPTS,
-  DOCKER_NOT_RUNNING_MESSAGE
+  DOCKER_NOT_RUNNING_MESSAGE,
+  DEFAULT_GENERATED_COMPOSE_FILE
 };