@geekmidas/cli 1.10.30 → 1.10.32

package/src/deploy/sniffer.ts

@@ -60,7 +60,17 @@ export type { SniffResult } from '@geekmidas/envkit/sniffer';
  */
 export interface SniffedEnvironment {
 	appName: string;
+	/**
+	 * All required environment variable names.
+	 * When `SniffAppOptions.markOptional` is true, optional variables are
+	 * suffixed with `?` (e.g. `PORT?`).
+	 */
 	requiredEnvVars: string[];
+	/**
+	 * Subset of variables that are optional (accessed via `.optional()` or
+	 * `.default()`). Always populated regardless of `markOptional`.
+	 */
+	optionalEnvVars: string[];
 }
 
 /**
@@ -69,6 +79,12 @@ export interface SniffedEnvironment {
 export interface SniffAppOptions {
 	/** Whether to log warnings for errors encountered during sniffing. Defaults to true. */
 	logWarnings?: boolean;
+	/**
+	 * When true, optional variables (those with `.optional()` or `.default()`)
+	 * are suffixed with `?` in `requiredEnvVars` (e.g. `PORT?`).
+	 * Defaults to false.
+	 */
+	markOptional?: boolean;
 }
 
 /**
@@ -97,7 +113,7 @@ export async function sniffAppEnvironment(
 	workspacePath: string,
 	options: SniffAppOptions = {},
 ): Promise<SniffedEnvironment> {
-	const { logWarnings = true } = options;
+	const { logWarnings = true, markOptional = false } = options;
 
 	// 1. Frontend apps - handle dependencies and config sniffing
 	if (app.type === 'frontend') {
@@ -110,6 +126,7 @@ export async function sniffAppEnvironment(
 		// The file calls .parse() at module load, which triggers sniffer to capture vars
 		if (app.config) {
 			const sniffedVars: string[] = [];
+			const sniffedOptional: string[] = [];
 
 			// Collect config paths to sniff
 			const configPaths: string[] = [];
@@ -131,14 +148,20 @@ export async function sniffAppEnvironment(
 				}
 
 				sniffedVars.push(...result.envVars);
+				sniffedOptional.push(...result.optionalEnvVars);
 			}
 
+			const optionalEnvVars = [...new Set(sniffedOptional)];
 			// Combine: dependency vars + sniffed vars (deduplicated)
-			const allVars = [...new Set([...depVars, ...sniffedVars])];
-			return { appName, requiredEnvVars: allVars };
+			const allVars = applyMarkOptional(
+				[...new Set([...depVars, ...sniffedVars])],
+				optionalEnvVars,
+				markOptional,
+			);
+			return { appName, requiredEnvVars: allVars, optionalEnvVars };
 		}
 
-		return { appName, requiredEnvVars: depVars };
+		return { appName, requiredEnvVars: depVars, optionalEnvVars: [] };
 	}
 
 	// 2. Entry apps - import entry file in subprocess to trigger config.parse()
@@ -151,7 +174,15 @@ export async function sniffAppEnvironment(
 			);
 		}
 
-		return { appName, requiredEnvVars: result.envVars };
+		return {
+			appName,
+			requiredEnvVars: applyMarkOptional(
+				result.envVars,
+				result.optionalEnvVars,
+				markOptional,
+			),
+			optionalEnvVars: result.optionalEnvVars,
+		};
 	}
 
 	// 4. Route-based apps - load routes and call getEnvironment() on each construct
@@ -168,7 +199,15 @@ export async function sniffAppEnvironment(
 			);
 		}
 
-		return { appName, requiredEnvVars: result.envVars };
+		return {
+			appName,
+			requiredEnvVars: applyMarkOptional(
+				result.envVars,
+				result.optionalEnvVars,
+				markOptional,
+			),
+			optionalEnvVars: result.optionalEnvVars,
+		};
 	}
 
 	// 5. Apps with envParser but no routes - run sniffer to detect env var usage
@@ -189,11 +228,33 @@ export async function sniffAppEnvironment(
 			}
 		}
 
-		return { appName, requiredEnvVars: result.envVars };
+		return {
+			appName,
+			requiredEnvVars: applyMarkOptional(
+				result.envVars,
+				result.optionalEnvVars,
+				markOptional,
+			),
+			optionalEnvVars: result.optionalEnvVars,
+		};
 	}
 
-	// 5. No env detection method available
-	return { appName, requiredEnvVars: [] };
+	// No env detection method available
+	return { appName, requiredEnvVars: [], optionalEnvVars: [] };
+}
+
+/**
+ * Apply the `?` suffix to optional variables in an env var list.
+ * Only modifies the list when `markOptional` is true and there are optional vars.
+ */
+function applyMarkOptional(
+	envVars: string[],
+	optionalEnvVars: string[],
+	markOptional: boolean,
+): string[] {
+	if (!markOptional || optionalEnvVars.length === 0) return envVars;
+	const optionalSet = new Set(optionalEnvVars);
+	return envVars.map((v) => (optionalSet.has(v) ? `${v}?` : v));
 }
 
 /**
@@ -201,6 +262,7 @@ export async function sniffAppEnvironment(
  */
 interface EntrySniffResult {
 	envVars: string[];
+	optionalEnvVars: string[];
 	error?: Error;
 }
 
@@ -267,6 +329,7 @@ async function sniffEntryFile(
 					const result = JSON.parse(jsonMatch[0]);
 					resolvePromise({
 						envVars: result.envVars || [],
+						optionalEnvVars: result.optionalEnvVars || [],
 						error: result.error ? new Error(result.error) : undefined,
 					});
 					return;
@@ -278,6 +341,7 @@ async function sniffEntryFile(
 			// If we couldn't parse the output, return empty with error info
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: new Error(
 					`Failed to sniff entry file (exit code ${code}): ${stderr || stdout || 'No output'}`,
 				),
@@ -287,6 +351,7 @@ async function sniffEntryFile(
 		child.on('error', (err) => {
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: err,
 			});
 		});
@@ -320,7 +385,11 @@ async function sniffRouteFiles(
 	const routesArray = Array.isArray(routes) ? routes : [routes];
 	const pattern = routesArray[0];
 	if (!pattern) {
-		return { envVars: [], error: new Error('No route patterns provided') };
+		return {
+			envVars: [],
+			optionalEnvVars: [],
+			error: new Error('No route patterns provided'),
+		};
 	}
 
 	return new Promise((resolvePromise) => {
@@ -364,6 +433,9 @@ async function sniffRouteFiles(
 					const result = JSON.parse(jsonMatch[0]);
 					resolvePromise({
 						envVars: result.envVars || [],
+						// Routes worker uses getEnvironment() which doesn't track
+						// optionality yet — populated when service register() is sniffed
+						optionalEnvVars: result.optionalEnvVars || [],
 						error: result.error ? new Error(result.error) : undefined,
 					});
 					return;
@@ -375,6 +447,7 @@ async function sniffRouteFiles(
 			// If we couldn't parse the output, return empty with error info
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: new Error(
 					`Failed to sniff route files (exit code ${code}): ${stderr || stdout || 'No output'}`,
 				),
@@ -384,6 +457,7 @@ async function sniffRouteFiles(
 		child.on('error', (err) => {
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: err,
 			});
 		});
@@ -410,7 +484,7 @@ async function sniffEnvParser(
 	// Parse the envParser path: './src/config/env#envParser' or './src/config/env'
 	const [modulePath, exportName = 'default'] = envParserPath.split('#');
 	if (!modulePath) {
-		return { envVars: [], unhandledRejections: [] };
+		return { envVars: [], optionalEnvVars: [], unhandledRejections: [] };
 	}
 
 	// Resolve the full path to the module
@@ -428,7 +502,7 @@ async function sniffEnvParser(
 		console.warn(
 			`[sniffer] Failed to import SnifferEnvironmentParser: ${message}`,
 		);
-		return { envVars: [], unhandledRejections: [] };
+		return { envVars: [], optionalEnvVars: [], unhandledRejections: [] };
 	}
 
 	const sniffer = new SnifferEnvironmentParser();

package/src/docker/compose.ts

@@ -280,6 +280,7 @@ services:
     restart: unless-stopped
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${imageName}}:\${SMTP_PASS:-${imageName}}
+      MP_SMTP_AUTH_ALLOW_INSECURE: true
     ports:
       - "\${MAILPIT_PORT:-8025}:8025"  # Web UI / API
       - "\${SMTP_PORT:-1025}:1025"  # SMTP
@@ -505,6 +506,7 @@ services:
     restart: unless-stopped
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${workspace.name}}:\${SMTP_PASS:-${workspace.name}}
+      MP_SMTP_AUTH_ALLOW_INSECURE: true
     ports:
       - "\${MAILPIT_PORT:-8025}:8025"  # Web UI / API
       - "\${SMTP_PORT:-1025}:1025"  # SMTP

package/src/generators/CronGenerator.ts

@@ -51,7 +51,9 @@ export class CronGenerator extends ConstructGenerator<
 				schedule: construct.schedule || 'rate(1 hour)',
 				timeout: construct.timeout,
 				memorySize: construct.memorySize,
-				environment: await construct.getEnvironment(),
+				environment: await construct.getEnvironment({
+					markOptional: context.markOptional,
+				}),
 			});
 
 			logger.log(`Generated cron handler: ${key}`);

package/src/generators/EndpointGenerator.ts

@@ -130,7 +130,9 @@ export class EndpointGenerator extends ConstructGenerator<
 					),
 					timeout: construct.timeout,
 					memorySize: construct.memorySize,
-					environment: await construct.getEnvironment(),
+					environment: await construct.getEnvironment({
+						markOptional: context.markOptional,
+					}),
 					authorizer: construct.authorizer?.name ?? 'none',
 				};
 
@@ -160,7 +162,9 @@ export class EndpointGenerator extends ConstructGenerator<
 					),
 					timeout: construct.timeout,
 					memorySize: construct.memorySize,
-					environment: await construct.getEnvironment(),
+					environment: await construct.getEnvironment({
+						markOptional: context.markOptional,
+					}),
 					authorizer: construct.authorizer?.name ?? 'none',
 				};
 

package/src/generators/FunctionGenerator.ts

@@ -69,7 +69,9 @@ export class FunctionGenerator extends ConstructGenerator<
 				),
 				timeout: construct.timeout,
 				memorySize: construct.memorySize,
-				environment: await construct.getEnvironment(),
+				environment: await construct.getEnvironment({
+					markOptional: context.markOptional,
+				}),
 			});
 
 			logger.log(`Generated function handler: ${key}`);

package/src/generators/SubscriberGenerator.ts

@@ -70,7 +70,9 @@ export class SubscriberGenerator extends ConstructGenerator<
 				subscribedEvents: construct.subscribedEvents || [],
 				timeout: construct.timeout,
 				memorySize: construct.memorySize,
-				environment: await construct.getEnvironment(),
+				environment: await construct.getEnvironment({
+					markOptional: context.markOptional,
+				}),
 			});
 
 			logger.log(`Generated subscriber handler: ${key}`);

package/src/index.ts

@@ -107,6 +107,10 @@ program
 	.option('--production', 'Build for production (no dev tools, bundled output)')
 	.option('--skip-bundle', 'Skip bundling step in production build')
 	.option('--stage <stage>', 'Inject encrypted secrets for deployment stage')
+	.option(
+		'--mark-optional',
+		'Suffix optional env vars with ? in manifest envVars field (e.g. PORT?)',
+	)
 	.action(
 		async (options: {
 			provider?: string;
@@ -115,6 +119,7 @@ program
 			production?: boolean;
 			skipBundle?: boolean;
 			stage?: string;
+			markOptional?: boolean;
 		}) => {
 			try {
 				const globalOptions = program.opts();
@@ -133,6 +138,7 @@ program
 						production: options.production || false,
 						skipBundle: options.skipBundle || false,
 						stage: options.stage,
+						markOptional: options.markOptional || false,
 					});
 				}
 				// Handle legacy providers option
@@ -146,6 +152,7 @@ program
 						production: options.production || false,
 						skipBundle: options.skipBundle || false,
 						stage: options.stage,
+						markOptional: options.markOptional || false,
 					});
 				}
 				// Default to config-driven build
@@ -155,6 +162,7 @@ program
 						production: options.production || false,
 						skipBundle: options.skipBundle || false,
 						stage: options.stage,
+						markOptional: options.markOptional || false,
 					});
 				}
 			} catch (error) {

package/src/init/generators/docker.ts

@@ -259,7 +259,7 @@ ${volumes.join('\n')}
  */
 function generateDockerEnv(
 	apps: DatabaseAppConfig[],
-	eventsBackend?: EventsBackend,
+	_eventsBackend?: EventsBackend,
 ): string {
 	const envVars = apps.map((app) => {
 		const envVar = `${app.name.toUpperCase()}_DB_PASSWORD`;
@@ -285,7 +285,7 @@ ${envVars.join('\n')}
  */
 function generatePostgresInitScript(
 	apps: DatabaseAppConfig[],
-	eventsBackend?: EventsBackend,
+	_eventsBackend?: EventsBackend,
 ): string {
 	const userCreations = apps.map((app) => {
 		const userName = app.name.replace(/-/g, '_');

package/src/init/generators/monorepo.ts

@@ -389,7 +389,13 @@ export default defineWorkspace({
   },`;
 
 	// Add services if any are selected
-	if (services.db || services.cache || services.mail) {
+	if (
+		services.db ||
+		services.cache ||
+		services.mail ||
+		services.storage ||
+		services.events
+	) {
 		config += `
   services: {`;
 		if (services.db) {
@@ -403,6 +409,14 @@ export default defineWorkspace({
 		if (services.mail) {
 			config += `
     mail: true,`;
+		}
+		if (services.storage) {
+			config += `
+    storage: true,`;
+		}
+		if (services.events) {
+			config += `
+    events: '${services.events}',`;
 		}
 		config += `
   },`;

package/src/init/index.ts

@@ -192,11 +192,9 @@ export async function initCommand(
 		? ['db', 'cache', 'mail', 'storage']
 		: answers.services || [];
 
-	// Determine events backend (default to pgboss for fullstack with --yes)
+	// Determine events backend (default to pgboss for all templates with --yes)
 	const eventsBackend: EventsBackend | undefined = options.yes
-		? isFullstack
-			? 'pgboss'
-			: undefined
+		? 'pgboss'
 		: answers.eventsBackend;
 
 	const services: ServicesSelection = {

package/src/init/versions.ts

@@ -32,10 +32,10 @@ export const GEEKMIDAS_VERSIONS = {
 	'@geekmidas/cache': '~1.1.0',
 	'@geekmidas/client': '~4.0.4',
 	'@geekmidas/cloud': '~1.0.0',
-	'@geekmidas/constructs': '~3.0.6',
+	'@geekmidas/constructs': '~3.0.7',
 	'@geekmidas/db': '~1.0.1',
 	'@geekmidas/emailkit': '~1.0.0',
-	'@geekmidas/envkit': '~1.0.4',
+	'@geekmidas/envkit': '~1.0.5',
 	'@geekmidas/errors': '~1.0.0',
 	'@geekmidas/events': '~1.1.0',
 	'@geekmidas/logger': '~1.0.0',

package/src/openapi.ts

@@ -115,7 +115,7 @@ export async function openapiCommand(
 				logger.log(`Found ${result.endpointCount} endpoints`);
 			}
 		} else {
-			// Workspace config - generate for each backend app and copy to frontend clients
+			// Workspace config - generate for each backend app
 			const { workspace } = loadedConfig;
 			const workspaceRoot = options.cwd || process.cwd();
 
@@ -132,11 +132,6 @@ export async function openapiCommand(
 				return;
 			}
 
-			// Find frontend apps with client config
-			const frontendApps = Object.entries(workspace.apps).filter(
-				([_, app]) => app.type === 'frontend' && app.client?.output,
-			);
-
 			// Generate OpenAPI for each backend app
 			for (const [appName, app] of backendApps) {
 				if (app.type !== 'backend' || !app.routes) continue;
@@ -164,35 +159,6 @@ export async function openapiCommand(
 					logger.log(
 						`📄 [${appName}] Generated OpenAPI (${result.endpointCount} endpoints)`,
 					);
-
-					// Copy to frontend apps that depend on this backend
-					for (const [frontendName, frontendApp] of frontendApps) {
-						if (frontendApp.type !== 'frontend') continue;
-
-						const dependsOnBackend =
-							!frontendApp.dependencies ||
-							frontendApp.dependencies.includes(appName);
-
-						if (dependsOnBackend && frontendApp.client?.output) {
-							const frontendPath = join(workspaceRoot, frontendApp.path);
-							const clientOutputPath = join(
-								frontendPath,
-								frontendApp.client.output,
-								'openapi.ts',
-							);
-
-							await mkdir(dirname(clientOutputPath), { recursive: true });
-
-							// Read the generated content and write to frontend
-							const { readFile } = await import('node:fs/promises');
-							const content = await readFile(result.outputPath, 'utf-8');
-							await writeFile(clientOutputPath, content);
-
-							logger.log(
-								`   → [${frontendName}] ${frontendApp.client.output}/openapi.ts`,
-							);
-						}
-					}
 				}
 			}
 		}

package/src/types.ts

@@ -332,6 +332,13 @@ export interface BuildOptions {
 	skipBundle?: boolean;
 	/** Stage for secrets injection (e.g., 'production', 'staging') */
 	stage?: string;
+	/**
+	 * When true, optional environment variables (those with `.optional()` or
+	 * `.default()` in the envParser) are suffixed with `?` within each
+	 * construct's `environment` array in the manifest (e.g. `PORT?`).
+	 * Defaults to false.
+	 */
+	markOptional?: boolean;
 }
 
 /** Result from build command when secrets are injected */