@geekmidas/cli 0.23.0 → 0.25.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env -S npx tsx
 import { __require, getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-CPLEZDZf.mjs";
-import { loadConfig, loadWorkspaceConfig, parseModuleConfig } from "./config-BaYqrF3n.mjs";
-import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, OpenApiTsGenerator, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-CgqR6Jkw.mjs";
+import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceConfig, parseModuleConfig } from "./config-BogU0_oQ.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, OpenApiTsGenerator, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-DNbXfhXE.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-Dhst7BhI.mjs";
 import { DokployApi } from "./dokploy-api-B9qR2Yn1.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-5rSortLH.mjs";
@@ -26,7 +26,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.23.0";
+var version = "0.25.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -976,10 +976,10 @@ function normalizeStudioConfig(config$1) {
 * Normalize hooks configuration
 * @internal Exported for testing
 */
-function normalizeHooksConfig(config$1) {
+function normalizeHooksConfig(config$1, cwd = process.cwd()) {
 	if (!config$1?.server) return void 0;
 	const serverPath = config$1.server.endsWith(".ts") ? config$1.server : `${config$1.server}.ts`;
-	const resolvedPath = resolve(process.cwd(), serverPath);
+	const resolvedPath = resolve(cwd, serverPath);
 	return { serverHooksPath: resolvedPath };
 }
 /**
@@ -1013,14 +1013,32 @@ function getProductionConfigFromGkm(config$1) {
 async function devCommand(options) {
 	const defaultEnv = loadEnvFiles(".env");
 	if (defaultEnv.loaded.length > 0) logger$8.log(`📦 Loaded env: ${defaultEnv.loaded.join(", ")}`);
-	const loadedConfig = await loadWorkspaceConfig();
-	if (loadedConfig.type === "workspace") {
-		logger$8.log("📦 Detected workspace configuration");
-		return workspaceDevCommand(loadedConfig.workspace, options);
+	const appName = getAppNameFromCwd();
+	let config$1;
+	let appRoot = process.cwd();
+	if (appName) try {
+		const appConfig = await loadAppConfig();
+		config$1 = appConfig.gkmConfig;
+		appRoot = appConfig.appRoot;
+		logger$8.log(`📦 Running app: ${appConfig.appName}`);
+	} catch {
+		const loadedConfig = await loadWorkspaceConfig();
+		if (loadedConfig.type === "workspace") {
+			logger$8.log("📦 Detected workspace configuration");
+			return workspaceDevCommand(loadedConfig.workspace, options);
+		}
+		config$1 = loadedConfig.raw;
+	}
+	else {
+		const loadedConfig = await loadWorkspaceConfig();
+		if (loadedConfig.type === "workspace") {
+			logger$8.log("📦 Detected workspace configuration");
+			return workspaceDevCommand(loadedConfig.workspace, options);
+		}
+		config$1 = loadedConfig.raw;
 	}
-	const config$1 = loadedConfig.raw;
 	if (config$1.env) {
-		const { loaded, missing } = loadEnvFiles(config$1.env);
+		const { loaded, missing } = loadEnvFiles(config$1.env, appRoot);
 		if (loaded.length > 0) logger$8.log(`📦 Loaded env: ${loaded.join(", ")}`);
 		if (missing.length > 0) logger$8.warn(`⚠️  Missing env files: ${missing.join(", ")}`);
 	}
@@ -1037,7 +1055,7 @@ async function devCommand(options) {
 	if (telescope) logger$8.log(`🔭 Telescope enabled at ${telescope.path}`);
 	const studio = normalizeStudioConfig(config$1.studio);
 	if (studio) logger$8.log(`🗄️  Studio enabled at ${studio.path}`);
-	const hooks = normalizeHooksConfig(config$1.hooks);
+	const hooks = normalizeHooksConfig(config$1.hooks, appRoot);
 	if (hooks) logger$8.log(`🪝 Server hooks enabled from ${config$1.hooks?.server}`);
 	const openApiConfig = resolveOpenApiConfig(config$1);
 	const enableOpenApi = openApiConfig.enabled || resolved.enableOpenApi;
@@ -1051,10 +1069,10 @@ async function devCommand(options) {
 		studio,
 		hooks
 	};
-	await buildServer(config$1, buildContext, resolved.providers[0], enableOpenApi);
+	await buildServer(config$1, buildContext, resolved.providers[0], enableOpenApi, appRoot);
 	if (enableOpenApi) await generateOpenApi(config$1);
 	const runtime = config$1.runtime ?? "node";
-	const devServer = new DevServer(resolved.providers[0], options.port || 3e3, options.portExplicit ?? false, enableOpenApi, telescope, studio, runtime);
+	const devServer = new DevServer(resolved.providers[0], options.port || 3e3, options.portExplicit ?? false, enableOpenApi, telescope, studio, runtime, appRoot);
 	await devServer.start();
 	const envParserFile = config$1.envParser.split("#")[0] ?? config$1.envParser;
 	const loggerFile = config$1.logger.split("#")[0] ?? config$1.logger;
@@ -1072,7 +1090,7 @@ async function devCommand(options) {
 	const normalizedPatterns = watchPatterns.map((p) => p.startsWith("./") ? p.slice(2) : p);
 	logger$8.log(`👀 Watching for changes in: ${normalizedPatterns.join(", ")}`);
 	const resolvedFiles = await fg(normalizedPatterns, {
-		cwd: process.cwd(),
+		cwd: appRoot,
 		absolute: false,
 		onlyFiles: true
 	});
@@ -1085,7 +1103,7 @@ async function devCommand(options) {
 		ignored: /(^|[/\\])\../,
 		persistent: true,
 		ignoreInitial: true,
-		cwd: process.cwd()
+		cwd: appRoot
 	});
 	watcher.on("ready", () => {
 		logger$8.log("🔍 File watcher ready");
@@ -1100,7 +1118,7 @@ async function devCommand(options) {
 		rebuildTimeout = setTimeout(async () => {
 			try {
 				logger$8.log("🔄 Rebuilding...");
-				await buildServer(config$1, buildContext, resolved.providers[0], enableOpenApi);
+				await buildServer(config$1, buildContext, resolved.providers[0], enableOpenApi, appRoot);
 				if (enableOpenApi) await generateOpenApi(config$1, { silent: true });
 				logger$8.log("✅ Rebuild complete, restarting server...");
 				await devServer.restart();
@@ -1322,11 +1340,25 @@ async function workspaceDevCommand(workspace, options) {
 		const deps = app.dependencies.length > 0 ? ` (depends on: ${app.dependencies.join(", ")})` : "";
 		logger$8.log(`   ${app.type === "backend" ? "🔧" : "🌐"} ${appName} → http://localhost:${app.port}${deps}`);
 	}
+	const configFiles = [
+		"gkm.config.ts",
+		"gkm.config.js",
+		"gkm.config.json"
+	];
+	let configPath = "";
+	for (const file of configFiles) {
+		const fullPath = join(workspace.root, file);
+		if (existsSync(fullPath)) {
+			configPath = fullPath;
+			break;
+		}
+	}
 	const turboEnv = {
 		...process.env,
 		...secretsEnv,
 		...dependencyEnv,
-		NODE_ENV: "development"
+		NODE_ENV: "development",
+		...configPath ? { GKM_CONFIG_PATH: configPath } : {}
 	};
 	logger$8.log("\n🏃 Starting turbo run dev...\n");
 	const turboProcess = spawn("pnpm", [
@@ -1429,18 +1461,18 @@ async function workspaceDevCommand(workspace, options) {
 		});
 	});
 }
-async function buildServer(config$1, context, provider, enableOpenApi) {
+async function buildServer(config$1, context, provider, enableOpenApi, appRoot = process.cwd()) {
 	const endpointGenerator = new EndpointGenerator();
 	const functionGenerator = new FunctionGenerator();
 	const cronGenerator = new CronGenerator();
 	const subscriberGenerator = new SubscriberGenerator();
 	const [allEndpoints, allFunctions, allCrons, allSubscribers] = await Promise.all([
-		endpointGenerator.load(config$1.routes),
-		config$1.functions ? functionGenerator.load(config$1.functions) : [],
-		config$1.crons ? cronGenerator.load(config$1.crons) : [],
-		config$1.subscribers ? subscriberGenerator.load(config$1.subscribers) : []
+		endpointGenerator.load(config$1.routes, appRoot),
+		config$1.functions ? functionGenerator.load(config$1.functions, appRoot) : [],
+		config$1.crons ? cronGenerator.load(config$1.crons, appRoot) : [],
+		config$1.subscribers ? subscriberGenerator.load(config$1.subscribers, appRoot) : []
 	]);
-	const outputDir = join(process.cwd(), ".gkm", provider);
+	const outputDir = join(appRoot, ".gkm", provider);
 	await mkdir(outputDir, { recursive: true });
 	await Promise.all([
 		endpointGenerator.build(context, allEndpoints, outputDir, {
@@ -1456,7 +1488,7 @@ var DevServer = class {
 	serverProcess = null;
 	isRunning = false;
 	actualPort;
-	constructor(provider, requestedPort, portExplicit, enableOpenApi, telescope, studio, runtime = "node") {
+	constructor(provider, requestedPort, portExplicit, enableOpenApi, telescope, studio, runtime = "node", appRoot = process.cwd()) {
 		this.provider = provider;
 		this.requestedPort = requestedPort;
 		this.portExplicit = portExplicit;
@@ -1464,6 +1496,7 @@ var DevServer = class {
 		this.telescope = telescope;
 		this.studio = studio;
 		this.runtime = runtime;
+		this.appRoot = appRoot;
 		this.actualPort = requestedPort;
 	}
 	async start() {
@@ -1476,7 +1509,7 @@ var DevServer = class {
 			this.actualPort = await findAvailablePort(this.requestedPort);
 			if (this.actualPort !== this.requestedPort) logger$8.log(`ℹ️  Port ${this.requestedPort} was in use, using port ${this.actualPort} instead`);
 		}
-		const serverEntryPath = join(process.cwd(), ".gkm", this.provider, "server.ts");
+		const serverEntryPath = join(this.appRoot, ".gkm", this.provider, "server.ts");
 		await this.createServerEntry();
 		logger$8.log(`\n✨ Starting server on port ${this.actualPort}...`);
 		this.serverProcess = spawn("npx", [
@@ -1544,7 +1577,7 @@ var DevServer = class {
 	async createServerEntry() {
 		const { writeFile: writeFile$1 } = await import("node:fs/promises");
 		const { relative: relative$1, dirname: dirname$1 } = await import("node:path");
-		const serverPath = join(process.cwd(), ".gkm", this.provider, "server.ts");
+		const serverPath = join(this.appRoot, ".gkm", this.provider, "server.ts");
 		const relativeAppPath = relative$1(dirname$1(serverPath), join(dirname$1(serverPath), "app.js"));
 		const serveCode = this.runtime === "bun" ? `Bun.serve({
       port,
@@ -3069,7 +3102,7 @@ async function workspaceDockerCommand(workspace, options) {
 * Get app name from package.json in the current working directory
 * Used for Dokploy app/project naming
 */
-function getAppNameFromCwd() {
+function getAppNameFromCwd$1() {
 	const packageJsonPath = join(process.cwd(), "package.json");
 	if (!existsSync(packageJsonPath)) return void 0;
 	try {
@@ -3187,7 +3220,7 @@ async function deployDocker(options) {
 */
 function resolveDockerConfig(config$1) {
 	const projectName = getAppNameFromPackageJson() ?? "app";
-	const appName = getAppNameFromCwd() ?? projectName;
+	const appName = getAppNameFromCwd$1() ?? projectName;
 	const imageName = config$1.docker?.imageName ?? appName;
 	return {
 		registry: config$1.docker?.registry,
@@ -4223,7 +4256,14 @@ function rotateServicePassword(secrets, service) {
 //#endregion
 //#region src/init/versions.ts
 const require$1 = createRequire(import.meta.url);
-const pkg = require$1("../package.json");
+function loadPackageJson() {
+	try {
+		return require$1("../package.json");
+	} catch {
+		return require$1("../../package.json");
+	}
+}
+const pkg = loadPackageJson();
 /**
 * CLI version from package.json (used for scaffolded projects)
 */
@@ -4324,7 +4364,7 @@ export const logger = createLogger();
 `;
 	const authTs = `import { betterAuth } from 'better-auth';
 import { magicLink } from 'better-auth/plugins';
-import { Pool } from 'pg';
+import pg from 'pg';
 import { envParser } from './config/env.js';
 import { logger } from './config/logger.js';
 
@@ -4339,7 +4379,7 @@ const authConfig = envParser
   .parse();
 
 export const auth = betterAuth({
-  database: new Pool({
+  database: new pg.Pool({
     connectionString: authConfig.databaseUrl,
   }),
   baseURL: authConfig.baseUrl,
@@ -4753,7 +4793,7 @@ function generateDockerFiles(options, template, dbApps) {
       retries: 5`);
 		volumes.push("  rabbitmq_data:");
 	}
-	if (options.services.mail) services.push(`  mailpit:
+	if (options.services?.mail) services.push(`  mailpit:
     image: axllent/mailpit:latest
     container_name: ${options.name}-mailpit
     restart: unless-stopped
@@ -5304,10 +5344,12 @@ const apiTemplate = {
 	dependencies: {
 		"@geekmidas/constructs": GEEKMIDAS_VERSIONS["@geekmidas/constructs"],
 		"@geekmidas/envkit": GEEKMIDAS_VERSIONS["@geekmidas/envkit"],
+		"@geekmidas/events": GEEKMIDAS_VERSIONS["@geekmidas/events"],
 		"@geekmidas/logger": GEEKMIDAS_VERSIONS["@geekmidas/logger"],
 		"@geekmidas/services": GEEKMIDAS_VERSIONS["@geekmidas/services"],
 		"@geekmidas/errors": GEEKMIDAS_VERSIONS["@geekmidas/errors"],
 		"@geekmidas/auth": GEEKMIDAS_VERSIONS["@geekmidas/auth"],
+		"@hono/node-server": "~1.14.1",
 		hono: "~4.8.2",
 		pino: "~9.6.0"
 	},
@@ -5509,6 +5551,7 @@ const minimalTemplate = {
 		"@geekmidas/constructs": GEEKMIDAS_VERSIONS["@geekmidas/constructs"],
 		"@geekmidas/envkit": GEEKMIDAS_VERSIONS["@geekmidas/envkit"],
 		"@geekmidas/logger": GEEKMIDAS_VERSIONS["@geekmidas/logger"],
+		"@hono/node-server": "~1.14.1",
 		hono: "~4.8.2",
 		pino: "~9.6.0"
 	},
@@ -5673,6 +5716,7 @@ const serverlessTemplate = {
 		"@geekmidas/envkit": GEEKMIDAS_VERSIONS["@geekmidas/envkit"],
 		"@geekmidas/logger": GEEKMIDAS_VERSIONS["@geekmidas/logger"],
 		"@geekmidas/cloud": GEEKMIDAS_VERSIONS["@geekmidas/cloud"],
+		"@hono/node-server": "~1.14.1",
 		hono: "~4.8.2",
 		pino: "~9.6.0"
 	},
@@ -5784,6 +5828,7 @@ const workerTemplate = {
 		"@geekmidas/envkit": GEEKMIDAS_VERSIONS["@geekmidas/envkit"],
 		"@geekmidas/logger": GEEKMIDAS_VERSIONS["@geekmidas/logger"],
 		"@geekmidas/events": GEEKMIDAS_VERSIONS["@geekmidas/events"],
+		"@hono/node-server": "~1.14.1",
 		hono: "~4.8.2",
 		pino: "~9.6.0"
 	},