@geekmidas/cli 0.31.0 → 0.33.0

package/dist/index.cjs

@@ -27,7 +27,7 @@ const node_module = require_chunk.__toESM(require("node:module"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.30.0";
+var version = "0.33.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1012,6 +1012,7 @@ function getProductionConfigFromGkm(config) {
 	return void 0;
 }
 async function devCommand(options) {
+	if (options.entry) return entryDevCommand(options);
 	const defaultEnv = loadEnvFiles(".env");
 	if (defaultEnv.loaded.length > 0) logger$8.log(`📦 Loaded env: ${defaultEnv.loaded.join(", ")}`);
 	const appName = require_config.getAppNameFromCwd();
@@ -1523,6 +1524,168 @@ async function buildServer(config, context, provider, enableOpenApi, appRoot = p
 		subscriberGenerator.build(context, allSubscribers, outputDir, { provider })
 	]);
 }
+/**
+* Find the directory containing .gkm/secrets/.
+* Walks up from cwd until it finds one, or returns cwd.
+* @internal Exported for testing
+*/
+function findSecretsRoot(startDir) {
+	let dir = startDir;
+	while (dir !== "/") {
+		if ((0, node_fs.existsSync)((0, node_path.join)(dir, ".gkm", "secrets"))) return dir;
+		const parent = (0, node_path.dirname)(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+	return startDir;
+}
+/**
+* Create a wrapper script that injects secrets before importing the entry file.
+* @internal Exported for testing
+*/
+async function createEntryWrapper(wrapperPath, entryPath, secretsJsonPath) {
+	const credentialsInjection = secretsJsonPath ? `import { Credentials } from '@geekmidas/envkit/credentials';
+import { existsSync, readFileSync } from 'node:fs';
+
+// Inject dev secrets into Credentials (before app import)
+const secretsPath = '${secretsJsonPath}';
+if (existsSync(secretsPath)) {
+  Object.assign(Credentials, JSON.parse(readFileSync(secretsPath, 'utf-8')));
+}
+
+` : "";
+	const content = `#!/usr/bin/env node
+/**
+ * Entry wrapper generated by 'gkm dev --entry'
+ */
+${credentialsInjection}// Import and run the user's entry file (dynamic import ensures secrets load first)
+await import('${entryPath}');
+`;
+	await (0, node_fs_promises.writeFile)(wrapperPath, content);
+}
+/**
+* Run any TypeScript file with secret injection.
+* Does not require gkm.config.ts.
+*/
+async function entryDevCommand(options) {
+	const { entry, port = 3e3, watch = true } = options;
+	if (!entry) throw new Error("--entry requires a file path");
+	const entryPath = (0, node_path.resolve)(process.cwd(), entry);
+	if (!(0, node_fs.existsSync)(entryPath)) throw new Error(`Entry file not found: ${entryPath}`);
+	logger$8.log(`🚀 Starting entry file: ${entry}`);
+	const defaultEnv = loadEnvFiles(".env");
+	if (defaultEnv.loaded.length > 0) logger$8.log(`📦 Loaded env: ${defaultEnv.loaded.join(", ")}`);
+	const secretsRoot = findSecretsRoot(process.cwd());
+	logger$8.log(`🔍 Secrets root: ${secretsRoot}`);
+	const appName = require_config.getAppNameFromCwd() ?? void 0;
+	if (appName) logger$8.log(`📦 App name: ${appName}`);
+	const appSecrets = await loadSecretsForApp(secretsRoot, appName);
+	if (Object.keys(appSecrets).length > 0) logger$8.log(`🔐 Loaded ${Object.keys(appSecrets).length} secret(s)`);
+	else logger$8.log(`⚠️  No secrets found in ${secretsRoot}/.gkm/secrets/`);
+	let secretsJsonPath;
+	if (Object.keys(appSecrets).length > 0) {
+		const secretsDir = (0, node_path.join)(secretsRoot, ".gkm");
+		await (0, node_fs_promises.mkdir)(secretsDir, { recursive: true });
+		secretsJsonPath = (0, node_path.join)(secretsDir, "dev-secrets.json");
+		await (0, node_fs_promises.writeFile)(secretsJsonPath, JSON.stringify(appSecrets, null, 2));
+	}
+	const wrapperDir = (0, node_path.join)(process.cwd(), ".gkm");
+	await (0, node_fs_promises.mkdir)(wrapperDir, { recursive: true });
+	const wrapperPath = (0, node_path.join)(wrapperDir, "entry-wrapper.ts");
+	await createEntryWrapper(wrapperPath, entryPath, secretsJsonPath);
+	const runner = new EntryRunner(wrapperPath, entryPath, watch, port);
+	await runner.start();
+	let isShuttingDown = false;
+	const shutdown = () => {
+		if (isShuttingDown) return;
+		isShuttingDown = true;
+		logger$8.log("\n🛑 Shutting down...");
+		runner.stop();
+		process.exit(0);
+	};
+	process.on("SIGINT", shutdown);
+	process.on("SIGTERM", shutdown);
+	await new Promise(() => {});
+}
+/**
+* Runs and watches a TypeScript entry file using tsx.
+*/
+var EntryRunner = class {
+	childProcess = null;
+	watcher = null;
+	isRunning = false;
+	constructor(wrapperPath, entryPath, watch, port) {
+		this.wrapperPath = wrapperPath;
+		this.entryPath = entryPath;
+		this.watch = watch;
+		this.port = port;
+	}
+	async start() {
+		await this.runProcess();
+		if (this.watch) {
+			const watchDir = (0, node_path.dirname)(this.entryPath);
+			this.watcher = chokidar.default.watch(watchDir, {
+				ignored: /(^|[/\\])\../,
+				persistent: true,
+				ignoreInitial: true
+			});
+			let restartTimeout = null;
+			this.watcher.on("change", (path) => {
+				logger$8.log(`📝 File changed: ${path}`);
+				if (restartTimeout) clearTimeout(restartTimeout);
+				restartTimeout = setTimeout(async () => {
+					logger$8.log("🔄 Restarting...");
+					await this.restart();
+				}, 300);
+			});
+			logger$8.log(`👀 Watching for changes in: ${watchDir}`);
+		}
+	}
+	async runProcess() {
+		const env = {
+			...process.env,
+			PORT: String(this.port)
+		};
+		this.childProcess = (0, node_child_process.spawn)("npx", ["tsx", this.wrapperPath], {
+			stdio: "inherit",
+			env,
+			detached: true
+		});
+		this.isRunning = true;
+		this.childProcess.on("error", (error) => {
+			logger$8.error("❌ Process error:", error);
+		});
+		this.childProcess.on("exit", (code) => {
+			if (code !== null && code !== 0 && code !== 143) logger$8.error(`❌ Process exited with code ${code}`);
+			this.isRunning = false;
+		});
+		await new Promise((resolve$1) => setTimeout(resolve$1, 500));
+		if (this.isRunning) logger$8.log(`\n🎉 Running at http://localhost:${this.port}`);
+	}
+	async restart() {
+		this.stopProcess();
+		await new Promise((resolve$1) => setTimeout(resolve$1, 500));
+		await this.runProcess();
+	}
+	stop() {
+		this.watcher?.close();
+		this.stopProcess();
+	}
+	stopProcess() {
+		if (this.childProcess && this.isRunning) {
+			const pid = this.childProcess.pid;
+			if (pid) try {
+				process.kill(-pid, "SIGTERM");
+			} catch {
+				try {
+					process.kill(pid, "SIGTERM");
+				} catch {}
+			}
+			this.childProcess = null;
+			this.isRunning = false;
+		}
+	}
+};
 var DevServer = class {
 	serverProcess = null;
 	isRunning = false;
@@ -1616,9 +1779,9 @@ var DevServer = class {
 	}
 	async createServerEntry() {
 		const { writeFile: fsWriteFile } = await import("node:fs/promises");
-		const { relative: relative$7, dirname: dirname$7 } = await import("node:path");
+		const { relative: relative$7, dirname: dirname$8 } = await import("node:path");
 		const serverPath = (0, node_path.join)(this.appRoot, ".gkm", this.provider, "server.ts");
-		const relativeAppPath = relative$7(dirname$7(serverPath), (0, node_path.join)(dirname$7(serverPath), "app.js"));
+		const relativeAppPath = relative$7(dirname$8(serverPath), (0, node_path.join)(dirname$8(serverPath), "app.js"));
 		const credentialsInjection = this.secretsJsonPath ? `import { Credentials } from '@geekmidas/envkit/credentials';
 import { existsSync, readFileSync } from 'node:fs';
 
@@ -4333,7 +4496,7 @@ const GEEKMIDAS_VERSIONS = {
 	"@geekmidas/constructs": "~0.6.0",
 	"@geekmidas/db": "~0.3.0",
 	"@geekmidas/emailkit": "~0.2.0",
-	"@geekmidas/envkit": "~0.4.0",
+	"@geekmidas/envkit": "~0.5.0",
 	"@geekmidas/errors": "~0.1.0",
 	"@geekmidas/events": "~0.2.0",
 	"@geekmidas/logger": "~0.4.0",
@@ -4362,7 +4525,7 @@ function generateAuthAppFiles(options) {
 		private: true,
 		type: "module",
 		scripts: {
-			dev: "tsx watch src/index.ts",
+			dev: "gkm dev --entry ./src/index.ts",
 			build: "tsc",
 			start: "node dist/index.js",
 			typecheck: "tsc --noEmit"
@@ -4378,6 +4541,7 @@ function generateAuthAppFiles(options) {
 			pg: "~8.13.0"
 		},
 		devDependencies: {
+			"@geekmidas/cli": GEEKMIDAS_VERSIONS["@geekmidas/cli"],
 			"@types/node": "~22.0.0",
 			"@types/pg": "~8.11.0",
 			tsx: "~4.20.0",
@@ -7219,14 +7383,16 @@ program.command("build").description("Build handlers from endpoints, functions,
 		process.exit(1);
 	}
 });
-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) => {
+program.command("dev").description("Start development server with automatic reload").option("-p, --port <port>", "Port to run the development server on").option("--entry <file>", "Entry file to run (bypasses gkm config)").option("--watch", "Watch for file changes (default: true with --entry)").option("--no-watch", "Disable file watching").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, 10) : 3e3,
 			portExplicit: !!options.port,
-			enableOpenApi: options.enableOpenapi ?? true
+			enableOpenApi: options.enableOpenapi ?? true,
+			entry: options.entry,
+			watch: options.watch
 		});
 	} catch (error) {
 		console.error(error instanceof Error ? error.message : "Command failed");