@geekmidas/cli 1.10.4 → 1.10.6

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecr
 import { DokployApi } from "./dokploy-api-2ldYoN3i.mjs";
 import { encryptSecrets } from "./encryption-BOH5M-f-.mjs";
 import { CachedStateProvider } from "./CachedStateProvider-BDq5WqSy.mjs";
-import { createStageSecrets, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-odm79Uo1.mjs";
+import { createStageSecrets, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-ca0Kyrvt.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-C4UdILaI.mjs";
 import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-CbeKrnQV.mjs";
 import { createRequire } from "node:module";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.3";
+var version = "1.10.5";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -815,13 +815,19 @@ function rewriteUrlsWithPorts(secrets, resolvedPorts) {
 	const { ports, mappings } = resolvedPorts;
 	const result = { ...secrets };
 	const portReplacements = [];
+	const serviceNames = /* @__PURE__ */ new Set();
 	for (const mapping of mappings) {
+		serviceNames.add(mapping.service);
 		const resolved = ports[mapping.envVar];
 		if (resolved !== void 0) portReplacements.push({
 			defaultPort: mapping.defaultPort,
 			resolvedPort: resolved
 		});
 	}
+	for (const [key, value] of Object.entries(result)) {
+		if (!key.endsWith("_HOST")) continue;
+		if (serviceNames.has(value)) result[key] = "localhost";
+	}
 	for (const [key, value] of Object.entries(result)) {
 		if (!key.endsWith("_PORT")) continue;
 		for (const { defaultPort, resolvedPort } of portReplacements) if (value === String(defaultPort)) result[key] = String(resolvedPort);
@@ -829,6 +835,7 @@ function rewriteUrlsWithPorts(secrets, resolvedPorts) {
 	for (const [key, value] of Object.entries(result)) {
 		if (!key.endsWith("_URL") && key !== "DATABASE_URL") continue;
 		let rewritten = value;
+		for (const name$1 of serviceNames) rewritten = rewritten.replace(new RegExp(`@${name$1}:`, "g"), "@localhost:");
 		for (const { defaultPort, resolvedPort } of portReplacements) rewritten = replacePortInUrl(rewritten, defaultPort, resolvedPort);
 		result[key] = rewritten;
 	}
@@ -2834,7 +2841,7 @@ const DEFAULT_SERVICE_IMAGES = {
 };
 /** Default Docker image versions for services */
 const DEFAULT_SERVICE_VERSIONS = {
-	postgres: "16-alpine",
+	postgres: "18-alpine",
 	redis: "7-alpine",
 	rabbitmq: "3-management-alpine"
 };
@@ -2882,7 +2889,7 @@ services:
     environment:
       - NODE_ENV=production
 `;
-	if (serviceMap.has("postgres")) yaml += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/app}
+	if (serviceMap.has("postgres")) yaml += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://\${POSTGRES_USER:-postgres}:\${POSTGRES_PASSWORD:-postgres}@postgres:5432/\${POSTGRES_DB:-app}}
 `;
 	if (serviceMap.has("redis")) yaml += `      - REDIS_URL=\${REDIS_URL:-redis://redis:6379}
 `;
@@ -2915,9 +2922,9 @@ services:
       POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
       POSTGRES_DB: \${POSTGRES_DB:-app}
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - dbdata:/var/lib/postgresql/18/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -2964,7 +2971,7 @@ services:
 	yaml += `
 volumes:
 `;
-	if (serviceMap.has("postgres")) yaml += `  postgres_data:
+	if (serviceMap.has("postgres")) yaml += `  dbdata:
 `;
 	if (serviceMap.has("redis")) yaml += `  redis_data:
 `;
@@ -3044,9 +3051,9 @@ services:
       POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
       POSTGRES_DB: \${POSTGRES_DB:-app}
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - dbdata:/var/lib/postgresql/18/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -3082,7 +3089,7 @@ services:
 	yaml += `
 volumes:
 `;
-	if (hasPostgres) yaml += `  postgres_data:
+	if (hasPostgres) yaml += `  dbdata:
 `;
 	if (hasRedis) yaml += `  redis_data:
 `;
@@ -3098,7 +3105,7 @@ networks:
 */
 function getInfraServiceImage(serviceName, config$1) {
 	const defaults = {
-		postgres: "postgres:16-alpine",
+		postgres: "postgres:18-alpine",
 		redis: "redis:7-alpine"
 	};
 	if (!config$1 || config$1 === true) return defaults[serviceName];
@@ -3139,7 +3146,7 @@ function generateAppService(appName, app, allApps, options) {
 `;
 	}
 	if (app.type === "backend") {
-		if (hasPostgres) yaml += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/app}
+		if (hasPostgres) yaml += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://\${POSTGRES_USER:-postgres}:\${POSTGRES_PASSWORD:-postgres}@postgres:5432/\${POSTGRES_DB:-app}}
 `;
 		if (hasRedis) yaml += `      - REDIS_URL=\${REDIS_URL:-redis://redis:6379}
 `;
@@ -6947,23 +6954,23 @@ function generateDockerFiles(options, template, dbApps) {
     env_file:
       - ./docker/.env` : "";
 		services.push(`  postgres:
-    image: postgres:16-alpine
+    image: postgres:18-alpine
     container_name: ${options.name}-postgres
     restart: unless-stopped${envFile}
     environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: ${options.name.replace(/-/g, "_")}_dev
+      POSTGRES_USER: \${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: \${POSTGRES_DB:-${options.name.replace(/-/g, "_")}_dev}
     ports:
       - '\${POSTGRES_HOST_PORT:-5432}:5432'
     volumes:
-      - postgres_data:/var/lib/postgresql/data${initVolume}
+      - dbdata:/var/lib/postgresql/18/data${initVolume}
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U postgres']
+      test: ['CMD-SHELL', 'pg_isready -U $$POSTGRES_USER']
       interval: 5s
       timeout: 5s
       retries: 5`);
-		volumes.push("  postgres_data:");
+		volumes.push("  dbdata:");
 		if (isFullstack && dbApps?.length) {
 			files.push({
 				path: "docker/postgres/init.sh",
@@ -10861,7 +10868,7 @@ async function initCommand(projectName, options = {}) {
 	const secretServices = [];
 	if (services.db) secretServices.push("postgres");
 	if (services.cache) secretServices.push("redis");
-	const devSecrets = createStageSecrets("development", secretServices);
+	const devSecrets = createStageSecrets("development", secretServices, { projectName: name$1 });
 	const customSecrets = {
 		NODE_ENV: "development",
 		PORT: "3000",
@@ -10998,16 +11005,19 @@ async function secretsInitCommand(options) {
 	const config$1 = await loadConfig();
 	const services = getServicesFromConfig(config$1.docker?.compose?.services);
 	if (services.length === 0) logger$2.warn("No services configured in docker.compose.services. Creating secrets with empty services.");
-	const secrets = createStageSecrets(stage, services);
+	let projectName;
+	let workspaceSecrets;
 	try {
 		const loaded = await loadWorkspaceConfig();
+		projectName = loaded.workspace.name;
 		const isMultiApp = Object.keys(loaded.workspace.apps).length > 1;
 		if (isMultiApp) {
-			const customSecrets = generateFullstackCustomSecrets(loaded.workspace);
-			secrets.custom = customSecrets;
+			workspaceSecrets = generateFullstackCustomSecrets(loaded.workspace);
 			logger$2.log("  Detected workspace mode — generating per-app secrets");
 		}
 	} catch {}
+	const secrets = createStageSecrets(stage, services, { projectName });
+	if (workspaceSecrets) secrets.custom = workspaceSecrets;
 	await writeStageSecrets(secrets);
 	logger$2.log(`\n✓ Secrets initialized for stage "${stage}"`);
 	logger$2.log(`  Location: .gkm/secrets/${stage}.json`);
@@ -11285,7 +11295,7 @@ async function generateFreshSecrets(stage, workspace, options) {
 	const serviceNames = [];
 	if (workspace.services.db) serviceNames.push("postgres");
 	if (workspace.services.cache) serviceNames.push("redis");
-	const secrets = createStageSecrets(stage, serviceNames);
+	const secrets = createStageSecrets(stage, serviceNames, { projectName: workspace.name });
 	const isMultiApp = Object.keys(workspace.apps).length > 1;
 	if (isMultiApp) {
 		const customSecrets = generateFullstackCustomSecrets(workspace);
@@ -11368,7 +11378,6 @@ async function testCommand(options = {}) {
 		}
 	}
 	secretsEnv = rewriteDatabaseUrlForTests(secretsEnv);
-	await ensureTestDatabase(secretsEnv);
 	let dependencyEnv = {};
 	try {
 		const appInfo = await loadWorkspaceAppInfo(cwd);
@@ -11456,34 +11465,6 @@ function rewriteDatabaseUrlForTests(env) {
 	}
 	return result;
 }
-/**
-* Ensure the test database exists by connecting to the default database
-* and running CREATE DATABASE IF NOT EXISTS.
-* @internal Exported for testing
-*/
-async function ensureTestDatabase(env) {
-	const databaseUrl = env.DATABASE_URL;
-	if (!databaseUrl) return;
-	try {
-		const url = new URL(databaseUrl);
-		const testDbName = url.pathname.slice(1);
-		if (!testDbName) return;
-		url.pathname = "/postgres";
-		const { default: pg } = await import("pg");
-		const client = new pg.Client({ connectionString: url.toString() });
-		await client.connect();
-		try {
-			await client.query(`CREATE DATABASE "${testDbName}"`);
-			console.log(`  📦 Created test database "${testDbName}"`);
-		} catch (err) {
-			if (err.code !== "42P04") throw err;
-		} finally {
-			await client.end();
-		}
-	} catch (err) {
-		console.log(`  ⚠️  Could not ensure test database: ${err.message}`);
-	}
-}
 
 //#endregion
 //#region src/upgrade/index.ts
@@ -11851,7 +11832,7 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pushSecrets: pushSecrets$1 } = await import("./sync-6FoT41G3.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-C5OyCA7V.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Dx_jZbq6.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
@@ -11877,7 +11858,7 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pullSecrets: pullSecrets$1 } = await import("./sync-6FoT41G3.mjs");
 		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Dx_jZbq6.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-C5OyCA7V.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -11902,7 +11883,7 @@ 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-WzC1oAUV.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-C5OyCA7V.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Dx_jZbq6.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);