@geekmidas/cli 1.10.11 → 1.10.13

package/dist/index.mjs

@@ -4,13 +4,13 @@ import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployT
 import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
 import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, copyAllClients, copyClientToFrontends, generateOpenApi, getBackendOpenApiPath, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DenF-okj.mjs";
-import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-Df-NFMY9.mjs";
+import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-DMf420PP.mjs";
 import { DokployApi } from "./dokploy-api-2ldYoN3i.mjs";
 import { encryptSecrets } from "./encryption-BOH5M-f-.mjs";
 import { CachedStateProvider } from "./CachedStateProvider-BDq5WqSy.mjs";
-import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-Bnm_QeZr.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-BIFFv4UZ.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-C4UdILaI.mjs";
-import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-D-7NTKvV.mjs";
+import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-Do9O7QZ8.mjs";
 import { createRequire } from "node:module";
 import { copyFileSync, existsSync, readFileSync, unlinkSync } from "node:fs";
 import { basename, dirname, join, parse, relative, resolve } from "node:path";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.10";
+var version = "1.10.12";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1256,6 +1256,28 @@ function parseComposeServiceNames(composePath) {
 * This ensures manually added services are always started.
 * @internal Exported for testing
 */
+/**
+* Start docker-compose services for a single-app project (no workspace config).
+* Starts all services defined in docker-compose.yml.
+*/
+async function startComposeServices(cwd, portEnv, secretsEnv) {
+	const composeFile = join(cwd, "docker-compose.yml");
+	if (!existsSync(composeFile)) return;
+	const servicesToStart = parseComposeServiceNames(composeFile);
+	if (servicesToStart.length === 0) return;
+	logger$11.log(`🐳 Starting services: ${servicesToStart.join(", ")}`);
+	try {
+		execSync(`docker compose up -d ${servicesToStart.join(" ")}`, {
+			cwd,
+			stdio: "inherit",
+			env: buildDockerComposeEnv(secretsEnv, portEnv)
+		});
+		logger$11.log("✅ Services started");
+	} catch (error) {
+		logger$11.error("❌ Failed to start services:", error.message);
+		throw error;
+	}
+}
 async function startWorkspaceServices(workspace, portEnv, secretsEnv) {
 	const composeFile = join(workspace.root, "docker-compose.yml");
 	if (!existsSync(composeFile)) return;
@@ -2198,7 +2220,7 @@ async function buildForProvider(provider, context, rootOutputDir, endpointGenera
 		let masterKey;
 		if (context.production?.bundle && !skipBundle) {
 			logger$9.log(`\n📦 Bundling production server...`);
-			const { bundleServer } = await import("./bundler-BvByD6tt.mjs");
+			const { bundleServer } = await import("./bundler-Di5Gz9Ou.mjs");
 			const allConstructs = [
 				...endpoints.map((e) => e.construct),
 				...functions.map((f) => f.construct),
@@ -2861,14 +2883,16 @@ const DEFAULT_SERVICE_IMAGES = {
 	postgres: "postgres",
 	redis: "redis",
 	rabbitmq: "rabbitmq",
-	minio: "minio/minio"
+	minio: "minio/minio",
+	mailpit: "axllent/mailpit"
 };
 /** Default Docker image versions for services */
 const DEFAULT_SERVICE_VERSIONS = {
 	postgres: "18-alpine",
 	redis: "7-alpine",
 	rabbitmq: "3-management-alpine",
-	minio: "latest"
+	minio: "latest",
+	mailpit: "latest"
 };
 /** Get the default full image reference for a service */
 function getDefaultImage(serviceName) {
@@ -2928,6 +2952,11 @@ services:
       - STORAGE_BUCKET=\${STORAGE_BUCKET:-${imageName}}
       - STORAGE_REGION=\${STORAGE_REGION:-eu-west-1}
       - STORAGE_FORCE_PATH_STYLE=true
+`;
+	if (serviceMap.has("mailpit")) yaml += `      - SMTP_HOST=\${SMTP_HOST:-mailpit}
+      - SMTP_PORT=\${SMTP_PORT:-1025}
+      - SMTP_USER=\${SMTP_USER:-${imageName}}
+      - SMTP_PASS=\${SMTP_PASS:-${imageName}}
 `;
 	yaml += `    healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:${port}${healthCheckPath}"]
@@ -3025,6 +3054,25 @@ services:
       retries: 5
     networks:
       - app-network
+`;
+	const mailpitImage = serviceMap.get("mailpit");
+	if (mailpitImage) yaml += `
+  mailpit:
+    image: ${mailpitImage}
+    container_name: mailpit
+    restart: unless-stopped
+    environment:
+      MP_SMTP_AUTH: \${SMTP_USER:-${imageName}}:\${SMTP_PASS:-${imageName}}
+    ports:
+      - "\${MAILPIT_UI_PORT:-8025}:8025"  # Web UI
+      - "\${MAILPIT_SMTP_PORT:-1025}:1025"  # SMTP
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - app-network
 `;
 	yaml += `
 volumes:
@@ -3106,7 +3154,8 @@ services:
 		projectName: workspace.name,
 		hasPostgres,
 		hasRedis,
-		hasMinio
+		hasMinio,
+		hasMail
 	});
 	if (hasPostgres) yaml += `
   postgres:
@@ -3147,9 +3196,16 @@ services:
     image: axllent/mailpit:latest
     container_name: ${workspace.name}-mailpit
     restart: unless-stopped
+    environment:
+      MP_SMTP_AUTH: \${SMTP_USER:-${workspace.name}}:\${SMTP_PASS:-${workspace.name}}
     ports:
-      - "8025:8025"  # Web UI
-      - "1025:1025"  # SMTP
+      - "\${MAILPIT_UI_PORT:-8025}:8025"  # Web UI
+      - "\${MAILPIT_SMTP_PORT:-1025}:1025"  # SMTP
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
       - workspace-network
 `;
@@ -3219,7 +3275,7 @@ function getInfraServiceImage(serviceName, config$1) {
 * Generate a service definition for an app.
 */
 function generateAppService(appName, app, allApps, options) {
-	const { registry, projectName, hasPostgres, hasRedis, hasMinio } = options;
+	const { registry, projectName, hasPostgres, hasRedis, hasMinio, hasMail } = options;
 	const imageRef = registry ? `\${REGISTRY:-${registry}}/` : "";
 	const healthCheckPath = app.type === "frontend" ? "/" : "/health";
 	const healthCheckCmd = app.type === "frontend" ? `["CMD", "wget", "-q", "--spider", "http://localhost:${app.port}/"]` : `["CMD", "wget", "-q", "--spider", "http://localhost:${app.port}${healthCheckPath}"]`;
@@ -3253,6 +3309,11 @@ function generateAppService(appName, app, allApps, options) {
       - STORAGE_BUCKET=\${STORAGE_BUCKET:-${projectName}}
       - STORAGE_REGION=\${STORAGE_REGION:-eu-west-1}
       - STORAGE_FORCE_PATH_STYLE=true
+`;
+		if (hasMail) yaml += `      - SMTP_HOST=\${SMTP_HOST:-mailpit}
+      - SMTP_PORT=\${SMTP_PORT:-1025}
+      - SMTP_USER=\${SMTP_USER:-${projectName}}
+      - SMTP_PASS=\${SMTP_PASS:-${projectName}}
 `;
 	}
 	yaml += `    healthcheck:
@@ -3266,6 +3327,7 @@ function generateAppService(appName, app, allApps, options) {
 		if (hasPostgres) dependencies$1.push("postgres");
 		if (hasRedis) dependencies$1.push("redis");
 		if (hasMinio) dependencies$1.push("minio");
+		if (hasMail) dependencies$1.push("mailpit");
 	}
 	if (dependencies$1.length > 0) {
 		yaml += `    depends_on:
@@ -6310,7 +6372,7 @@ async function deployCommand(options) {
 		dokployConfig = setupResult.config;
 		finalRegistry = dokployConfig.registry ?? dockerConfig.registry;
 		if (setupResult.serviceUrls) {
-			const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1, initStageSecrets } = await import("./storage-D3lh8Xpq.mjs");
+			const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1, initStageSecrets } = await import("./storage-BFqrVsip.mjs");
 			let secrets = await readStageSecrets$1(stage);
 			if (!secrets) {
 				logger$3.log(`   Creating secrets file for stage "${stage}"...`);
@@ -6604,7 +6666,7 @@ const GEEKMIDAS_VERSIONS = {
 	"@geekmidas/rate-limit": "~2.0.0",
 	"@geekmidas/schema": "~1.0.0",
 	"@geekmidas/services": "~1.0.1",
-	"@geekmidas/storage": "~2.0.0",
+	"@geekmidas/storage": "~2.0.1",
 	"@geekmidas/studio": "~1.0.0",
 	"@geekmidas/telescope": "~1.0.0",
 	"@geekmidas/testkit": "~1.0.5",
@@ -7160,8 +7222,29 @@ function generateDockerFiles(options, template, dbApps) {
       - '\${MAILPIT_SMTP_HOST_PORT:-1025}:1025'
       - '\${MAILPIT_UI_HOST_PORT:-8025}:8025'
     environment:
-      MP_SMTP_AUTH_ACCEPT_ANY: 1
-      MP_SMTP_AUTH_ALLOW_INSECURE: 1`);
+      MP_SMTP_AUTH: \${SMTP_USER:-${options.name}}:\${SMTP_PASS:-${options.name}}`);
+	if (options.services?.storage) {
+		services.push(`  minio:
+    image: minio/minio:latest
+    container_name: ${options.name}-minio
+    restart: unless-stopped
+    entrypoint: sh
+    command: -c 'mkdir -p /data/\${STORAGE_BUCKET:-${options.name}} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
+    environment:
+      MINIO_ROOT_USER: \${STORAGE_ACCESS_KEY_ID:-${options.name}}
+      MINIO_ROOT_PASSWORD: \${STORAGE_SECRET_ACCESS_KEY:-${options.name}}
+    ports:
+      - '\${MINIO_API_HOST_PORT:-9000}:9000'
+      - '\${MINIO_CONSOLE_HOST_PORT:-9001}:9001'
+    volumes:
+      - minio_data:/data
+    healthcheck:
+      test: ['CMD', 'mc', 'ready', 'local']
+      interval: 10s
+      timeout: 5s
+      retries: 5`);
+		volumes.push("  minio_data:");
+	}
 	let dockerCompose = `# Use "gkm dev" or "gkm test" to start services.
 # Running "docker compose up" directly will not inject secrets or resolve ports.
 services:
@@ -8719,6 +8802,11 @@ const servicesChoices = [
 		title: "Mailpit",
 		value: "mail",
 		description: "Email testing service (dev only)"
+	},
+	{
+		title: "MinIO",
+		value: "storage",
+		description: "S3-compatible object storage (dev only)"
 	}
 ];
 /**
@@ -10888,12 +10976,14 @@ async function initCommand(projectName, options = {}) {
 	const servicesArray = options.yes ? [
 		"db",
 		"cache",
-		"mail"
+		"mail",
+		"storage"
 	] : answers.services || [];
 	const services = {
 		db: servicesArray.includes("db"),
 		cache: servicesArray.includes("cache"),
-		mail: servicesArray.includes("mail")
+		mail: servicesArray.includes("mail"),
+		storage: servicesArray.includes("storage")
 	};
 	const pkgManager = options.pm ? options.pm : options.yes ? "pnpm" : answers.packageManager ?? detectedPkgManager;
 	const deployTarget = options.yes ? "dokploy" : answers.deployTarget ?? "dokploy";
@@ -10976,6 +11066,7 @@ async function initCommand(projectName, options = {}) {
 	if (services.db) secretServices.push("postgres");
 	if (services.cache) secretServices.push("redis");
 	if (services.storage) secretServices.push("minio");
+	if (services.mail) secretServices.push("mailpit");
 	const devSecrets = createStageSecrets("development", secretServices, { projectName: name$1 });
 	const customSecrets = {
 		NODE_ENV: "development",
@@ -11397,6 +11488,10 @@ function reconcileSecrets(secrets, workspace) {
 		{
 			key: "storage",
 			name: "minio"
+		},
+		{
+			key: "mail",
+			name: "mailpit"
 		}
 	];
 	for (const { key, name: name$1 } of serviceMap) if (workspace.services[key] && !result.services[name$1]) {
@@ -11447,6 +11542,7 @@ async function generateFreshSecrets(stage, workspace, options) {
 	if (workspace.services.db) serviceNames.push("postgres");
 	if (workspace.services.cache) serviceNames.push("redis");
 	if (workspace.services.storage) serviceNames.push("minio");
+	if (workspace.services.mail) serviceNames.push("mailpit");
 	const secrets = createStageSecrets(stage, serviceNames, { projectName: workspace.name });
 	const isMultiApp = Object.keys(workspace.apps).length > 1;
 	if (isMultiApp) {
@@ -11544,14 +11640,21 @@ async function testCommand(options = {}) {
 		const composePath = join(cwd, "docker-compose.yml");
 		const mappings = parseComposePortMappings(composePath);
 		if (mappings.length > 0) {
-			const ports = await loadPortState(cwd);
-			if (Object.keys(ports).length > 0) {
-				secretsEnv = rewriteUrlsWithPorts(secretsEnv, {
-					dockerEnv: {},
-					ports,
-					mappings
-				});
-				console.log(`  🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
+			const resolvedPorts = await resolveServicePorts(cwd);
+			await startComposeServices(cwd, resolvedPorts.dockerEnv, secretsEnv);
+			if (resolvedPorts.mappings.length > 0) {
+				secretsEnv = rewriteUrlsWithPorts(secretsEnv, resolvedPorts);
+				console.log(`  🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`);
+			} else {
+				const ports = await loadPortState(cwd);
+				if (Object.keys(ports).length > 0) {
+					secretsEnv = rewriteUrlsWithPorts(secretsEnv, {
+						dockerEnv: {},
+						ports,
+						mappings
+					});
+					console.log(`  🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
+				}
 			}
 		}
 	}
@@ -11990,9 +12093,9 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { pushSecrets: pushSecrets$1 } = await import("./sync-CIzj1CQe.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile--yaWO052.mjs");
-		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-D3lh8Xpq.mjs");
+		const { pushSecrets: pushSecrets$1 } = await import("./sync-DjD_TeNX.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DxTEausy.mjs");
+		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-BFqrVsip.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
 		if (secrets) {
@@ -12015,9 +12118,9 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { pullSecrets: pullSecrets$1 } = await import("./sync-CIzj1CQe.mjs");
-		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-D3lh8Xpq.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile--yaWO052.mjs");
+		const { pullSecrets: pullSecrets$1 } = await import("./sync-DjD_TeNX.mjs");
+		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-BFqrVsip.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DxTEausy.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12042,8 +12145,8 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile--yaWO052.mjs");
-		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-D3lh8Xpq.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DxTEausy.mjs");
+		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-BFqrVsip.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
 		if (!secrets) {