@geekmidas/cli 0.7.0 → 0.9.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S npx tsx
 import { loadConfig, parseModuleConfig } from "./config-Bq72aj8e.mjs";
-import { ConstructGenerator, EndpointGenerator, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi-Mwy2_R4W.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi--vOy9mo4.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-CcciaVu5.mjs";
 import { join, relative } from "path";
 import { Command } from "commander";
@@ -19,7 +19,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.7.0";
+var version = "0.9.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -571,6 +571,16 @@ function normalizeStudioConfig(config$1) {
 		schema: studioConfig.schema ?? "public"
 	};
 }
+/**
+* Normalize hooks configuration
+* @internal Exported for testing
+*/
+function normalizeHooksConfig(config$1) {
+	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);
+	return { serverHooksPath: resolvedPath };
+}
 async function devCommand(options) {
 	const defaultEnv = loadEnvFiles(".env");
 	if (defaultEnv.loaded.length > 0) logger$2.log(`📦 Loaded env: ${defaultEnv.loaded.join(", ")}`);
@@ -593,31 +603,36 @@ async function devCommand(options) {
 	if (telescope) logger$2.log(`🔭 Telescope enabled at ${telescope.path}`);
 	const studio = normalizeStudioConfig(config$1.studio);
 	if (studio) logger$2.log(`🗄️  Studio enabled at ${studio.path}`);
+	const hooks = normalizeHooksConfig(config$1.hooks);
+	if (hooks) logger$2.log(`🪝 Server hooks enabled from ${config$1.hooks?.server}`);
 	const openApiConfig = resolveOpenApiConfig(config$1);
 	const enableOpenApi = openApiConfig.enabled || resolved.enableOpenApi;
-	if (enableOpenApi) logger$2.log(`📄 OpenAPI output: ${openApiConfig.output}`);
+	if (enableOpenApi) logger$2.log(`📄 OpenAPI output: ${OPENAPI_OUTPUT_PATH}`);
 	const buildContext = {
 		envParserPath,
 		envParserImportPattern,
 		loggerPath,
 		loggerImportPattern,
 		telescope,
-		studio
+		studio,
+		hooks
 	};
 	await buildServer(config$1, buildContext, resolved.providers[0], enableOpenApi);
 	if (enableOpenApi) await generateOpenApi(config$1);
 	const runtime = config$1.runtime ?? "node";
-	const devServer = new DevServer(resolved.providers[0], options.port || 3e3, enableOpenApi, telescope, studio, runtime);
+	const devServer = new DevServer(resolved.providers[0], options.port || 3e3, options.portExplicit ?? false, enableOpenApi, telescope, studio, runtime);
 	await devServer.start();
 	const envParserFile = config$1.envParser.split("#")[0];
 	const loggerFile = config$1.logger.split("#")[0];
+	const hooksFile = config$1.hooks?.server?.split("#")[0];
 	const watchPatterns = [
 		config$1.routes,
 		...config$1.functions ? [config$1.functions] : [],
 		...config$1.crons ? [config$1.crons] : [],
 		...config$1.subscribers ? [config$1.subscribers] : [],
 		envParserFile.endsWith(".ts") ? envParserFile : `${envParserFile}.ts`,
-		loggerFile.endsWith(".ts") ? loggerFile : `${loggerFile}.ts`
+		loggerFile.endsWith(".ts") ? loggerFile : `${loggerFile}.ts`,
+		...hooksFile ? [hooksFile.endsWith(".ts") ? hooksFile : `${hooksFile}.ts`] : []
 	].flat();
 	const normalizedPatterns = watchPatterns.map((p) => p.startsWith("./") ? p.slice(2) : p);
 	logger$2.log(`👀 Watching for changes in: ${normalizedPatterns.join(", ")}`);
@@ -656,11 +671,16 @@ async function devCommand(options) {
 			}
 		}, 300);
 	});
-	const shutdown = async () => {
+	let isShuttingDown = false;
+	const shutdown = () => {
+		if (isShuttingDown) return;
+		isShuttingDown = true;
 		logger$2.log("\n🛑 Shutting down...");
-		await watcher.close();
-		await devServer.stop();
-		process.exit(0);
+		Promise.all([watcher.close(), devServer.stop()]).catch((err) => {
+			logger$2.error("Error during shutdown:", err);
+		}).finally(() => {
+			process.exit(0);
+		});
 	};
 	process.on("SIGINT", shutdown);
 	process.on("SIGTERM", shutdown);
@@ -692,9 +712,10 @@ var DevServer = class {
 	serverProcess = null;
 	isRunning = false;
 	actualPort;
-	constructor(provider, requestedPort, enableOpenApi, telescope, studio, runtime = "node") {
+	constructor(provider, requestedPort, portExplicit, enableOpenApi, telescope, studio, runtime = "node") {
 		this.provider = provider;
 		this.requestedPort = requestedPort;
+		this.portExplicit = portExplicit;
 		this.enableOpenApi = enableOpenApi;
 		this.telescope = telescope;
 		this.studio = studio;
@@ -703,8 +724,14 @@ var DevServer = class {
 	}
 	async start() {
 		if (this.isRunning) await this.stop();
-		this.actualPort = await findAvailablePort(this.requestedPort);
-		if (this.actualPort !== this.requestedPort) logger$2.log(`ℹ️  Port ${this.requestedPort} was in use, using port ${this.actualPort} instead`);
+		if (this.portExplicit) {
+			const available = await isPortAvailable(this.requestedPort);
+			if (!available) throw new Error(`Port ${this.requestedPort} is already in use. Either stop the process using that port or omit -p/--port to auto-select an available port.`);
+			this.actualPort = this.requestedPort;
+		} else {
+			this.actualPort = await findAvailablePort(this.requestedPort);
+			if (this.actualPort !== this.requestedPort) logger$2.log(`ℹ️  Port ${this.requestedPort} was in use, using port ${this.actualPort} instead`);
+		}
 		const serverEntryPath = join$1(process.cwd(), ".gkm", this.provider, "server.ts");
 		await this.createServerEntry();
 		logger$2.log(`\n✨ Starting server on port ${this.actualPort}...`);
@@ -738,26 +765,25 @@ var DevServer = class {
 		}
 	}
 	async stop() {
+		const port = this.actualPort;
 		if (this.serverProcess && this.isRunning) {
 			const pid = this.serverProcess.pid;
 			if (pid) try {
-				process.kill(-pid, "SIGTERM");
-			} catch {}
-			await new Promise((resolve$1) => {
-				const timeout = setTimeout(() => {
-					if (pid) try {
-						process.kill(-pid, "SIGKILL");
-					} catch {}
-					resolve$1();
-				}, 3e3);
-				this.serverProcess?.on("exit", () => {
-					clearTimeout(timeout);
-					resolve$1();
-				});
-			});
+				process.kill(-pid, "SIGKILL");
+			} catch {
+				try {
+					process.kill(pid, "SIGKILL");
+				} catch {}
+			}
 			this.serverProcess = null;
 			this.isRunning = false;
 		}
+		this.killProcessesOnPort(port);
+	}
+	killProcessesOnPort(port) {
+		try {
+			execSync(`lsof -ti tcp:${port} | xargs kill -9 2>/dev/null || true`, { stdio: "ignore" });
+		} catch {}
 	}
 	async restart() {
 		const portToReuse = this.actualPort;
@@ -898,12 +924,15 @@ async function buildCommand(options) {
 	const { path: loggerPath, importPattern: loggerImportPattern } = parseModuleConfig(config$1.logger, "logger");
 	const telescope = normalizeTelescopeConfig(config$1.telescope);
 	if (telescope) logger.log(`🔭 Telescope enabled at ${telescope.path}`);
+	const hooks = normalizeHooksConfig(config$1.hooks);
+	if (hooks) logger.log(`🪝 Server hooks enabled`);
 	const buildContext = {
 		envParserPath,
 		envParserImportPattern,
 		loggerPath,
 		loggerImportPattern,
-		telescope
+		telescope,
+		hooks
 	};
 	const endpointGenerator = new EndpointGenerator();
 	const functionGenerator = new FunctionGenerator();
@@ -2282,7 +2311,7 @@ export const telescope = new Telescope({
 /**
 * OpenAPI output path (fixed, not configurable)
 */
-const OPENAPI_OUTPUT_PATH = "./.gkm/openapi.ts";
+const OPENAPI_OUTPUT_PATH$1 = "./.gkm/openapi.ts";
 /**
 * All available templates
 */
@@ -2399,8 +2428,8 @@ function generatePackageJson(options, template) {
 		private: true,
 		type: "module",
 		exports: { "./client": {
-			types: OPENAPI_OUTPUT_PATH,
-			import: OPENAPI_OUTPUT_PATH
+			types: OPENAPI_OUTPUT_PATH$1,
+			import: OPENAPI_OUTPUT_PATH$1
 		} },
 		scripts: scripts$1,
 		dependencies: sortObject(dependencies$1),
@@ -2678,12 +2707,13 @@ program.command("build").description("Build handlers from endpoints, functions,
 		process.exit(1);
 	}
 });
-program.command("dev").description("Start development server with automatic reload").option("--port <port>", "Port to run the development server on", "3000").option("--enable-openapi", "Enable OpenAPI documentation for development server", true).action(async (options) => {
+program.command("dev").description("Start development server with automatic reload").option("-p, --port <port>", "Port to run the development server on").option("--enable-openapi", "Enable OpenAPI documentation for development server", true).action(async (options) => {
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		await devCommand({
 			port: options.port ? Number.parseInt(options.port) : 3e3,
+			portExplicit: !!options.port,
 			enableOpenApi: options.enableOpenapi ?? true
 		});
 	} catch (error) {
@@ -2706,11 +2736,11 @@ program.command("api").description("Manage REST API endpoints").action(() => {
 	if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 	process.stdout.write("REST API management - coming soon\n");
 });
-program.command("openapi").description("Generate OpenAPI specification from endpoints (TypeScript by default)").option("--output <path>", "Output file path for the OpenAPI spec", "openapi.ts").option("--json", "Generate JSON instead of TypeScript (legacy)", false).action(async (options) => {
+program.command("openapi").description("Generate OpenAPI specification from endpoints").action(async () => {
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		await openapiCommand(options);
+		await openapiCommand({});
 	} catch (error) {
 		console.error("OpenAPI generation failed:", error.message);
 		process.exit(1);