@geekmidas/cli 1.10.3 → 1.10.5

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-UZAFWuH4.mjs";
+import { createStageSecrets, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-odm79Uo1.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.2";
+var version = "1.10.4";
 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;
 	}
@@ -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}
 `;
@@ -2917,7 +2924,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -3046,7 +3053,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -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}
 `;
@@ -6951,15 +6958,15 @@ function generateDockerFiles(options, template, dbApps) {
     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}
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U postgres']
+      test: ['CMD-SHELL', 'pg_isready -U $$POSTGRES_USER']
       interval: 5s
       timeout: 5s
       retries: 5`);
@@ -7607,6 +7614,7 @@ export default defineWorkspace({
       path: 'apps/auth',
       port: 3002,
       entry: './src/index.ts',
+      framework: 'better-auth',
       envParser: './src/config/env#envParser',
       logger: './src/config/logger#logger',
     },
@@ -7649,6 +7657,10 @@ export default defineWorkspace({
     default: 'dokploy',
   },`;
 	config$1 += `
+  secrets: {
+    enabled: true,
+  },`;
+	config$1 += `
 });
 `;
 	return config$1;
@@ -11363,7 +11375,6 @@ async function testCommand(options = {}) {
 		}
 	}
 	secretsEnv = rewriteDatabaseUrlForTests(secretsEnv);
-	await ensureTestDatabase(secretsEnv);
 	let dependencyEnv = {};
 	try {
 		const appInfo = await loadWorkspaceAppInfo(cwd);
@@ -11384,6 +11395,24 @@ async function testCommand(options = {}) {
 		}
 	} catch {}
 	console.log("");
+	const allSecrets = {
+		...secretsEnv,
+		...dependencyEnv
+	};
+	const gkmDir = join(cwd, ".gkm");
+	await mkdir(gkmDir, { recursive: true });
+	const secretsJsonPath = join(gkmDir, "test-secrets.json");
+	await writeFile(secretsJsonPath, JSON.stringify(allSecrets, null, 2));
+	const preloadPath = join(gkmDir, "test-credentials-preload.ts");
+	await createCredentialsPreload(preloadPath, secretsJsonPath);
+	const existingNodeOptions = process.env.NODE_OPTIONS ?? "";
+	const tsxImport = "--import=tsx";
+	const preloadImport = `--import=${preloadPath}`;
+	const nodeOptions = [
+		existingNodeOptions,
+		tsxImport,
+		preloadImport
+	].filter(Boolean).join(" ");
 	const args = [];
 	if (options.run) args.push("run");
 	else if (options.watch) args.push("--watch");
@@ -11395,9 +11424,9 @@ async function testCommand(options = {}) {
 		stdio: "inherit",
 		env: {
 			...process.env,
-			...secretsEnv,
-			...dependencyEnv,
-			NODE_ENV: "test"
+			...allSecrets,
+			NODE_ENV: "test",
+			NODE_OPTIONS: nodeOptions
 		}
 	});
 	return new Promise((resolve$1, reject) => {
@@ -11433,34 +11462,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
@@ -11828,7 +11829,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-D2WCDQue.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.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);
@@ -11854,7 +11855,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-D2WCDQue.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -11879,7 +11880,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-D2WCDQue.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.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);