@geekmidas/cli 0.52.0 → 0.54.0

package/dist/index.mjs

@@ -20,6 +20,7 @@ import chokidar from "chokidar";
 import { config } from "dotenv";
 import fg from "fast-glob";
 import { Cron } from "@geekmidas/constructs/crons";
+import { Endpoint } from "@geekmidas/constructs/endpoints";
 import { Function } from "@geekmidas/constructs/functions";
 import { Subscriber } from "@geekmidas/constructs/subscribers";
 import { createHash, randomBytes } from "node:crypto";
@@ -30,7 +31,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.52.0";
+var version = "0.54.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -3385,7 +3386,7 @@ WORKDIR /app
 COPY . .
 
 # Build production server using gkm
-RUN pnpm exec gkm build --provider server --production
+RUN ${pm.exec} gkm build --provider server --production
 
 # Stage 3: Production
 FROM ${baseImage} AS runner
@@ -3467,7 +3468,7 @@ WORKDIR /app
 COPY --from=pruner /app/out/full/ ./
 
 # Build production server using gkm
-RUN pnpm exec gkm build --provider server --production
+RUN ${pm.exec} gkm build --provider server --production
 
 # Stage 4: Production
 FROM ${baseImage} AS runner
@@ -3788,7 +3789,7 @@ RUN if [ -n "$GKM_ENCRYPTED_CREDENTIALS" ]; then \
     fi
 
 # Build production server using gkm
-RUN cd ${appPath} && pnpm exec gkm build --provider server --production
+RUN cd ${appPath} && ${pm.exec} gkm build --provider server --production
 
 # Stage 4: Production
 FROM ${baseImage} AS runner
@@ -4522,7 +4523,8 @@ function buildRedisUrl(redis) {
 function resolveEnvVar(varName, context) {
 	switch (varName) {
 		case "PORT": return String(context.app.port);
-		case "NODE_ENV": return context.stage === "production" ? "production" : "development";
+		case "NODE_ENV": return "production";
+		case "STAGE": return context.stage;
 		case "DATABASE_URL":
 			if (context.appCredentials && context.postgres) return buildDatabaseUrl(context.appCredentials, context.postgres);
 			break;
@@ -4856,6 +4858,12 @@ function generateSecretsReport(encryptedApps, sniffedApps) {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 /**
+* Check if a value is a gkm construct (Endpoint, Function, Cron, or Subscriber).
+*/
+function isConstruct(value) {
+	return Endpoint.isEndpoint(value) || Function.isFunction(value) || Cron.isCron(value) || Subscriber.isSubscriber(value);
+}
+/**
 * Resolve the path to a sniffer helper file.
 * Handles both dev (.ts with tsx) and production (.mjs from dist).
 *
@@ -4880,8 +4888,9 @@ function resolveSnifferFile(baseName) {
 * 1. Frontend apps: Returns empty (no server secrets)
 * 2. Apps with `requiredEnv`: Uses explicit list from config
 * 3. Entry apps: Imports entry file in subprocess to capture config.parse() calls
-* 4. Apps with `envParser`: Runs SnifferEnvironmentParser to detect usage
-* 5. Apps with neither: Returns empty
+* 4. Route-based apps: Loads route files and calls getEnvironment() on each construct
+* 5. Apps with `envParser` (no routes): Runs SnifferEnvironmentParser to detect usage
+* 6. Apps with neither: Returns empty
 *
 * This function handles "fire and forget" async operations gracefully,
 * capturing errors and unhandled rejections without failing the build.
@@ -4910,6 +4919,14 @@ async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 			requiredEnvVars: result.envVars
 		};
 	}
+	if (app.routes) {
+		const result = await sniffRouteFiles(app.routes, app.path, workspacePath);
+		if (logWarnings && result.error) console.warn(`[sniffer] ${appName}: Route sniffing threw error (env vars still captured): ${result.error.message}`);
+		return {
+			appName,
+			requiredEnvVars: result.envVars
+		};
+	}
 	if (app.envParser) {
 		const result = await sniffEnvParser(app.envParser, app.path, workspacePath);
 		if (logWarnings) {
@@ -5001,6 +5018,47 @@ async function sniffEntryFile(entryPath, appPath, workspacePath) {
 	});
 }
 /**
+* Sniff route files by loading constructs and calling getEnvironment().
+*
+* Route-based apps have endpoints, functions, crons, and subscribers that
+* use services. Each service's register() method accesses environment variables.
+* This function mimics what the bundler does during build to capture those vars.
+*
+* @param routes - Glob pattern(s) for route files
+* @param appPath - The app's path relative to workspace (e.g., 'apps/api')
+* @param workspacePath - Absolute path to workspace root
+* @returns EntrySniffResult with env vars and optional error
+*/
+async function sniffRouteFiles(routes, appPath, workspacePath) {
+	const fullAppPath = resolve(workspacePath, appPath);
+	const patterns = Array.isArray(routes) ? routes : [routes];
+	const envVars = /* @__PURE__ */ new Set();
+	let error;
+	try {
+		const files = await fg(patterns, {
+			cwd: fullAppPath,
+			absolute: true
+		});
+		for (const file of files) try {
+			const module = await import(file);
+			for (const [, exportValue] of Object.entries(module)) if (isConstruct(exportValue)) try {
+				const constructEnvVars = await exportValue.getEnvironment();
+				constructEnvVars.forEach((v) => envVars.add(v));
+			} catch (e) {
+				console.warn(`[sniffer] Failed to get environment for construct in ${file}: ${e instanceof Error ? e.message : String(e)}`);
+			}
+		} catch (e) {
+			console.warn(`[sniffer] Failed to import ${file}: ${e instanceof Error ? e.message : String(e)}`);
+		}
+	} catch (e) {
+		error = e instanceof Error ? e : new Error(String(e));
+	}
+	return {
+		envVars: Array.from(envVars).sort(),
+		error
+	};
+}
+/**
 * Run the SnifferEnvironmentParser on an envParser module to detect
 * which environment variables it accesses.
 *
@@ -5788,7 +5846,13 @@ async function workspaceDeployCommand(workspace, options) {
 					masterKey: appSecrets?.masterKey
 				};
 				const appRequirements = sniffedApps.get(appName);
-				const requiredVars = appRequirements?.requiredEnvVars ?? [];
+				const sniffedVars = appRequirements?.requiredEnvVars ?? [];
+				const requiredVars = [...new Set([
+					"PORT",
+					"NODE_ENV",
+					"STAGE",
+					...sniffedVars
+				])];
 				const { valid, missing, resolved } = validateEnvVars(requiredVars, envContext);
 				if (!valid) throw new Error(formatMissingVarsError(appName, missing, stage));
 				const envVars = Object.entries(resolved).map(([key, value]) => `${key}=${value}`);
@@ -5882,7 +5946,11 @@ async function workspaceDeployCommand(workspace, options) {
 					buildArgs,
 					publicUrlArgs: getPublicUrlArgNames(app)
 				});
-				const envVars = [`NODE_ENV=production`, `PORT=${app.port}`];
+				const envVars = [
+					`NODE_ENV=production`,
+					`PORT=${app.port}`,
+					`STAGE=${stage}`
+				];
 				await api.saveDockerProvider(application.applicationId, imageRef, { registryId });
 				await api.saveApplicationEnv(application.applicationId, envVars.join("\n"));
 				logger$1.log(`      Deploying to Dokploy...`);