@geekmidas/cli 1.10.30 → 1.10.32

package/dist/index.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env -S npx tsx
 import { __require } from "./chunk-Duj1WY3L.mjs";
-import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-D4z4A4cq.mjs";
-import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
+import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-Bi4X7Yzy.mjs";
+import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-B62g483e.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
 import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-P84v8zWn.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-dbb9RyBl.mjs";
-import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-CTARkkkn.mjs";
+import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DE8b-vin.mjs";
 import { DokployApi } from "./dokploy-api-BIT0683o.mjs";
 import { encryptSecrets } from "./encryption-DSkIlEZ6.mjs";
 import { CachedStateProvider } from "./CachedStateProvider-C8A-cCm5.mjs";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.29";
+var version = "1.10.31";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -825,7 +825,7 @@ var CronGenerator = class 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$15.log(`Generated cron handler: ${key}`);
 		}
@@ -875,7 +875,7 @@ var FunctionGenerator = class extends ConstructGenerator {
 				handler: relative(process.cwd(), handlerFile).replace(/\.ts$/, ".handler"),
 				timeout: construct.timeout,
 				memorySize: construct.memorySize,
-				environment: await construct.getEnvironment()
+				environment: await construct.getEnvironment({ markOptional: context.markOptional })
 			});
 			logger$15.log(`Generated function handler: ${key}`);
 		}
@@ -929,7 +929,7 @@ var SubscriberGenerator = class extends ConstructGenerator {
 				subscribedEvents: construct.subscribedEvents || [],
 				timeout: construct.timeout,
 				memorySize: construct.memorySize,
-				environment: await construct.getEnvironment()
+				environment: await construct.getEnvironment({ markOptional: context.markOptional })
 			});
 			logger$15.log(`Generated subscriber handler: ${key}`);
 		}
@@ -2180,7 +2180,8 @@ async function buildCommand(options) {
 		studio,
 		hooks,
 		production,
-		dockerServices
+		dockerServices,
+		markOptional: options.markOptional ?? false
 	};
 	const endpointGenerator = new EndpointGenerator();
 	const functionGenerator = new FunctionGenerator();
@@ -2207,6 +2208,7 @@ async function buildCommand(options) {
 		const providerResult = await buildForProvider(provider, buildContext, rootOutputDir, endpointGenerator, functionGenerator, cronGenerator, subscriberGenerator, allEndpoints, allFunctions, allCrons, allSubscribers, resolved.enableOpenApi, options.skipBundle ?? false, options.stage);
 		if (providerResult.masterKey) result = providerResult;
 	}
+	await generateOpenApi(config$1, { bustCache: true });
 	return result;
 }
 async function buildForProvider(provider, context, rootOutputDir, endpointGenerator, functionGenerator, cronGenerator, subscriberGenerator, endpoints, functions, crons, subscribers, enableOpenApi, skipBundle, stage) {
@@ -2341,6 +2343,7 @@ async function workspaceBuildCommand(workspace, options) {
 			});
 		}
 		logger$9.log(`\n✅ Workspace build complete!`);
+		await openapiCommand({ cwd: workspace.root });
 		logger$9.log(`\n📋 Build Summary:`);
 		for (const result of results) {
 			const icon = result.type === "backend" ? "⚙️" : "🌐";
@@ -3123,6 +3126,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
@@ -3287,6 +3291,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
@@ -5216,11 +5221,12 @@ function resolveSnifferFile(baseName) {
 * @returns The sniffed environment with required variables
 */
 async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
-	const { logWarnings = true } = options;
+	const { logWarnings = true, markOptional = false } = options;
 	if (app.type === "frontend") {
 		const depVars = (app.dependencies ?? []).map((dep) => `NEXT_PUBLIC_${dep.toUpperCase()}_URL`);
 		if (app.config) {
 			const sniffedVars = [];
+			const sniffedOptional = [];
 			const configPaths = [];
 			if (app.config.client) configPaths.push(app.config.client);
 			if (app.config.server) configPaths.push(app.config.server);
@@ -5228,16 +5234,20 @@ async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 				const result = await sniffEntryFile(configPath, app.path, workspacePath);
 				if (logWarnings && result.error) console.warn(`[sniffer] ${appName}: Config file "${configPath}" threw error during sniffing (env vars still captured): ${result.error.message}`);
 				sniffedVars.push(...result.envVars);
+				sniffedOptional.push(...result.optionalEnvVars);
 			}
-			const allVars = [...new Set([...depVars, ...sniffedVars])];
+			const optionalEnvVars = [...new Set(sniffedOptional)];
+			const allVars = applyMarkOptional([...new Set([...depVars, ...sniffedVars])], optionalEnvVars, markOptional);
 			return {
 				appName,
-				requiredEnvVars: allVars
+				requiredEnvVars: allVars,
+				optionalEnvVars
 			};
 		}
 		return {
 			appName,
-			requiredEnvVars: depVars
+			requiredEnvVars: depVars,
+			optionalEnvVars: []
 		};
 	}
 	if (app.entry) {
@@ -5245,7 +5255,8 @@ async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 		if (logWarnings && result.error) console.warn(`[sniffer] ${appName}: Entry file threw error during sniffing (env vars still captured): ${result.error.message}`);
 		return {
 			appName,
-			requiredEnvVars: result.envVars
+			requiredEnvVars: applyMarkOptional(result.envVars, result.optionalEnvVars, markOptional),
+			optionalEnvVars: result.optionalEnvVars
 		};
 	}
 	if (app.routes) {
@@ -5253,7 +5264,8 @@ async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 		if (logWarnings && result.error) console.warn(`[sniffer] ${appName}: Route sniffing threw error (env vars still captured): ${result.error.message}`);
 		return {
 			appName,
-			requiredEnvVars: result.envVars
+			requiredEnvVars: applyMarkOptional(result.envVars, result.optionalEnvVars, markOptional),
+			optionalEnvVars: result.optionalEnvVars
 		};
 	}
 	if (app.envParser) {
@@ -5264,15 +5276,26 @@ async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 		}
 		return {
 			appName,
-			requiredEnvVars: result.envVars
+			requiredEnvVars: applyMarkOptional(result.envVars, result.optionalEnvVars, markOptional),
+			optionalEnvVars: result.optionalEnvVars
 		};
 	}
 	return {
 		appName,
-		requiredEnvVars: []
+		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, optionalEnvVars, markOptional) {
+	if (!markOptional || optionalEnvVars.length === 0) return envVars;
+	const optionalSet = new Set(optionalEnvVars);
+	return envVars.map((v) => optionalSet.has(v) ? `${v}?` : v);
+}
+/**
 * Sniff an entry file by importing it in a subprocess.
 *
 * Entry apps call `config.parse()` at module load time. To capture which
@@ -5328,6 +5351,7 @@ async function sniffEntryFile(entryPath, appPath, workspacePath) {
 					const result = JSON.parse(jsonMatch[0]);
 					resolvePromise({
 						envVars: result.envVars || [],
+						optionalEnvVars: result.optionalEnvVars || [],
 						error: result.error ? new Error(result.error) : void 0
 					});
 					return;
@@ -5335,12 +5359,14 @@ async function sniffEntryFile(entryPath, appPath, workspacePath) {
 			} catch {}
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: new Error(`Failed to sniff entry file (exit code ${code}): ${stderr || stdout$1 || "No output"}`)
 			});
 		});
 		child.on("error", (err) => {
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: err
 			});
 		});
@@ -5368,6 +5394,7 @@ async function sniffRouteFiles(routes, appPath, workspacePath) {
 	const pattern = routesArray[0];
 	if (!pattern) return {
 		envVars: [],
+		optionalEnvVars: [],
 		error: new Error("No route patterns provided")
 	};
 	return new Promise((resolvePromise) => {
@@ -5402,6 +5429,7 @@ async function sniffRouteFiles(routes, appPath, workspacePath) {
 					const result = JSON.parse(jsonMatch[0]);
 					resolvePromise({
 						envVars: result.envVars || [],
+						optionalEnvVars: result.optionalEnvVars || [],
 						error: result.error ? new Error(result.error) : void 0
 					});
 					return;
@@ -5409,12 +5437,14 @@ async function sniffRouteFiles(routes, appPath, workspacePath) {
 			} catch {}
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: new Error(`Failed to sniff route files (exit code ${code}): ${stderr || stdout$1 || "No output"}`)
 			});
 		});
 		child.on("error", (err) => {
 			resolvePromise({
 				envVars: [],
+				optionalEnvVars: [],
 				error: err
 			});
 		});
@@ -5436,6 +5466,7 @@ async function sniffEnvParser(envParserPath, appPath, workspacePath) {
 	const [modulePath, exportName = "default"] = envParserPath.split("#");
 	if (!modulePath) return {
 		envVars: [],
+		optionalEnvVars: [],
 		unhandledRejections: []
 	};
 	const fullPath = resolve(workspacePath, appPath, modulePath);
@@ -5450,6 +5481,7 @@ async function sniffEnvParser(envParserPath, appPath, workspacePath) {
 		console.warn(`[sniffer] Failed to import SnifferEnvironmentParser: ${message}`);
 		return {
 			envVars: [],
+			optionalEnvVars: [],
 			unhandledRejections: []
 		};
 	}
@@ -6806,10 +6838,10 @@ 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",
@@ -7454,7 +7486,7 @@ ${volumes.join("\n")}
 /**
 * Generate .env file for docker-compose with database passwords
 */
-function generateDockerEnv(apps, eventsBackend) {
+function generateDockerEnv(apps, _eventsBackend) {
 	const envVars = apps.map((app) => {
 		const envVar = `${app.name.toUpperCase()}_DB_PASSWORD`;
 		return `${envVar}=${app.password}`;
@@ -7473,7 +7505,7 @@ ${envVars.join("\n")}
 * - auth user: uses auth schema with search_path=auth
 * - pgboss user: uses pgboss schema (when events === 'pgboss')
 */
-function generatePostgresInitScript(apps, eventsBackend) {
+function generatePostgresInitScript(apps, _eventsBackend) {
 	const userCreations = apps.map((app) => {
 		const userName = app.name.replace(/-/g, "_");
 		const envVar = `${app.name.toUpperCase()}_DB_PASSWORD`;
@@ -8068,7 +8100,7 @@ export default defineWorkspace({
       schema: 'zod',
     },
   },`;
-	if (services.db || services.cache || services.mail) {
+	if (services.db || services.cache || services.mail || services.storage || services.events) {
 		config$1 += `
   services: {`;
 		if (services.db) config$1 += `
@@ -8077,6 +8109,10 @@ export default defineWorkspace({
     cache: true,`;
 		if (services.mail) config$1 += `
     mail: true,`;
+		if (services.storage) config$1 += `
+    storage: true,`;
+		if (services.events) config$1 += `
+    events: '${services.events}',`;
 		config$1 += `
   },`;
 	}
@@ -11306,7 +11342,7 @@ async function initCommand(projectName, options = {}) {
 		"mail",
 		"storage"
 	] : answers.services || [];
-	const eventsBackend = options.yes ? isFullstack ? "pgboss" : void 0 : answers.eventsBackend;
+	const eventsBackend = options.yes ? "pgboss" : answers.eventsBackend;
 	const services = {
 		db: servicesArray.includes("db"),
 		cache: servicesArray.includes("cache"),
@@ -12235,7 +12271,7 @@ program.command("setup").description("Setup development environment (secrets, Do
 		process.exit(1);
 	}
 });
-program.command("build").description("Build handlers from endpoints, functions, and crons").option("--provider <provider>", "Target provider for generated handlers (aws, server)").option("--providers <providers>", "[DEPRECATED] Use --provider instead. Target providers for generated handlers (comma-separated)").option("--enable-openapi", "Enable OpenAPI documentation generation for server builds").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").action(async (options) => {
+program.command("build").description("Build handlers from endpoints, functions, and crons").option("--provider <provider>", "Target provider for generated handlers (aws, server)").option("--providers <providers>", "[DEPRECATED] Use --provider instead. Target providers for generated handlers (comma-separated)").option("--enable-openapi", "Enable OpenAPI documentation generation for server builds").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) => {
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
@@ -12246,7 +12282,8 @@ program.command("build").description("Build handlers from endpoints, functions,
 				enableOpenApi: options.enableOpenapi || false,
 				production: options.production || false,
 				skipBundle: options.skipBundle || false,
-				stage: options.stage
+				stage: options.stage,
+				markOptional: options.markOptional || false
 			});
 		} else if (options.providers) {
 			const providerList = [...new Set(options.providers.split(",").map((p) => p.trim()))];
@@ -12255,13 +12292,15 @@ program.command("build").description("Build handlers from endpoints, functions,
 				enableOpenApi: options.enableOpenapi || false,
 				production: options.production || false,
 				skipBundle: options.skipBundle || false,
-				stage: options.stage
+				stage: options.stage,
+				markOptional: options.markOptional || false
 			});
 		} else await buildCommand({
 			enableOpenApi: options.enableOpenapi || false,
 			production: options.production || false,
 			skipBundle: options.skipBundle || false,
-			stage: options.stage
+			stage: options.stage,
+			markOptional: options.markOptional || false
 		});
 	} catch (error) {
 		console.error(formatError(error));