@geekmidas/cli 0.10.0 → 0.12.0

package/src/build/index.ts

@@ -5,195 +5,266 @@ import type { Endpoint } from '@geekmidas/constructs/endpoints';
 import type { Function } from '@geekmidas/constructs/functions';
 import type { Subscriber } from '@geekmidas/constructs/subscribers';
 import { loadConfig, parseModuleConfig } from '../config';
-import { normalizeHooksConfig, normalizeTelescopeConfig } from '../dev';
 import {
-  CronGenerator,
-  EndpointGenerator,
-  FunctionGenerator,
-  type GeneratedConstruct,
-  SubscriberGenerator,
+	getProductionConfigFromGkm,
+	normalizeHooksConfig,
+	normalizeProductionConfig,
+	normalizeStudioConfig,
+	normalizeTelescopeConfig,
+} from '../dev';
+import {
+	CronGenerator,
+	EndpointGenerator,
+	FunctionGenerator,
+	type GeneratedConstruct,
+	SubscriberGenerator,
 } from '../generators';
-import type { BuildOptions, LegacyProvider, RouteInfo } from '../types';
+import type {
+	BuildOptions,
+	BuildResult,
+	LegacyProvider,
+	RouteInfo,
+} from '../types';
 import {
-  type ServerAppInfo,
-  generateAwsManifest,
-  generateServerManifest,
+	generateAwsManifest,
+	generateServerManifest,
+	type ServerAppInfo,
 } from './manifests';
 import { resolveProviders } from './providerResolver';
 import type { BuildContext } from './types';
 
 const logger = console;
 
-export async function buildCommand(options: BuildOptions): Promise<void> {
-  const config = await loadConfig();
-
-  // Resolve providers from new config format
-  const resolved = resolveProviders(config, options);
-
-  logger.log(`Building with providers: ${resolved.providers.join(', ')}`);
-  logger.log(`Loading routes from: ${config.routes}`);
-  if (config.functions) {
-    logger.log(`Loading functions from: ${config.functions}`);
-  }
-  if (config.crons) {
-    logger.log(`Loading crons from: ${config.crons}`);
-  }
-  if (config.subscribers) {
-    logger.log(`Loading subscribers from: ${config.subscribers}`);
-  }
-  logger.log(`Using envParser: ${config.envParser}`);
-
-  // Parse envParser and logger configuration
-  const { path: envParserPath, importPattern: envParserImportPattern } =
-    parseModuleConfig(config.envParser, 'envParser');
-  const { path: loggerPath, importPattern: loggerImportPattern } =
-    parseModuleConfig(config.logger, 'logger');
-
-  // Normalize telescope configuration
-  const telescope = normalizeTelescopeConfig(config.telescope);
-  if (telescope) {
-    logger.log(`🔭 Telescope enabled at ${telescope.path}`);
-  }
-
-  // Normalize hooks configuration
-  const hooks = normalizeHooksConfig(config.hooks);
-  if (hooks) {
-    logger.log(`🪝 Server hooks enabled`);
-  }
-
-  const buildContext: BuildContext = {
-    envParserPath,
-    envParserImportPattern,
-    loggerPath,
-    loggerImportPattern,
-    telescope,
-    hooks,
-  };
-
-  // Initialize generators
-  const endpointGenerator = new EndpointGenerator();
-  const functionGenerator = new FunctionGenerator();
-  const cronGenerator = new CronGenerator();
-  const subscriberGenerator = new SubscriberGenerator();
-
-  // Load all constructs in parallel
-  const [allEndpoints, allFunctions, allCrons, allSubscribers] =
-    await Promise.all([
-      endpointGenerator.load(config.routes),
-      config.functions ? functionGenerator.load(config.functions) : [],
-      config.crons ? cronGenerator.load(config.crons) : [],
-      config.subscribers ? subscriberGenerator.load(config.subscribers) : [],
-    ]);
-
-  logger.log(`Found ${allEndpoints.length} endpoints`);
-  logger.log(`Found ${allFunctions.length} functions`);
-  logger.log(`Found ${allCrons.length} crons`);
-  logger.log(`Found ${allSubscribers.length} subscribers`);
-
-  if (
-    allEndpoints.length === 0 &&
-    allFunctions.length === 0 &&
-    allCrons.length === 0 &&
-    allSubscribers.length === 0
-  ) {
-    logger.log(
-      'No endpoints, functions, crons, or subscribers found to process',
-    );
-    return;
-  }
-
-  // Ensure .gkm directory exists
-  const rootOutputDir = join(process.cwd(), '.gkm');
-  await mkdir(rootOutputDir, { recursive: true });
-
-  // Build for each provider and generate per-provider manifests
-  for (const provider of resolved.providers) {
-    await buildForProvider(
-      provider,
-      buildContext,
-      rootOutputDir,
-      endpointGenerator,
-      functionGenerator,
-      cronGenerator,
-      subscriberGenerator,
-      allEndpoints,
-      allFunctions,
-      allCrons,
-      allSubscribers,
-      resolved.enableOpenApi,
-    );
-  }
+export async function buildCommand(
+	options: BuildOptions,
+): Promise<BuildResult> {
+	const config = await loadConfig();
+
+	// Resolve providers from new config format
+	const resolved = resolveProviders(config, options);
+
+	// Normalize production configuration
+	const productionConfigFromGkm = getProductionConfigFromGkm(config);
+	const production = normalizeProductionConfig(
+		options.production ?? false,
+		productionConfigFromGkm,
+	);
+
+	if (production) {
+		logger.log(`🏭 Building for PRODUCTION`);
+	}
+
+	logger.log(`Building with providers: ${resolved.providers.join(', ')}`);
+	logger.log(`Loading routes from: ${config.routes}`);
+	if (config.functions) {
+		logger.log(`Loading functions from: ${config.functions}`);
+	}
+	if (config.crons) {
+		logger.log(`Loading crons from: ${config.crons}`);
+	}
+	if (config.subscribers) {
+		logger.log(`Loading subscribers from: ${config.subscribers}`);
+	}
+	logger.log(`Using envParser: ${config.envParser}`);
+
+	// Parse envParser and logger configuration
+	const { path: envParserPath, importPattern: envParserImportPattern } =
+		parseModuleConfig(config.envParser, 'envParser');
+	const { path: loggerPath, importPattern: loggerImportPattern } =
+		parseModuleConfig(config.logger, 'logger');
+
+	// Normalize telescope configuration (disabled in production)
+	const telescope = production
+		? undefined
+		: normalizeTelescopeConfig(config.telescope);
+	if (telescope) {
+		logger.log(`🔭 Telescope enabled at ${telescope.path}`);
+	}
+
+	// Normalize studio configuration (disabled in production)
+	const studio = production ? undefined : normalizeStudioConfig(config.studio);
+	if (studio) {
+		logger.log(`🗄️  Studio enabled at ${studio.path}`);
+	}
+
+	// Normalize hooks configuration
+	const hooks = normalizeHooksConfig(config.hooks);
+	if (hooks) {
+		logger.log(`🪝 Server hooks enabled`);
+	}
+
+	const buildContext: BuildContext = {
+		envParserPath,
+		envParserImportPattern,
+		loggerPath,
+		loggerImportPattern,
+		telescope,
+		studio,
+		hooks,
+		production,
+	};
+
+	// Initialize generators
+	const endpointGenerator = new EndpointGenerator();
+	const functionGenerator = new FunctionGenerator();
+	const cronGenerator = new CronGenerator();
+	const subscriberGenerator = new SubscriberGenerator();
+
+	// Load all constructs in parallel
+	const [allEndpoints, allFunctions, allCrons, allSubscribers] =
+		await Promise.all([
+			endpointGenerator.load(config.routes),
+			config.functions ? functionGenerator.load(config.functions) : [],
+			config.crons ? cronGenerator.load(config.crons) : [],
+			config.subscribers ? subscriberGenerator.load(config.subscribers) : [],
+		]);
+
+	logger.log(`Found ${allEndpoints.length} endpoints`);
+	logger.log(`Found ${allFunctions.length} functions`);
+	logger.log(`Found ${allCrons.length} crons`);
+	logger.log(`Found ${allSubscribers.length} subscribers`);
+
+	if (
+		allEndpoints.length === 0 &&
+		allFunctions.length === 0 &&
+		allCrons.length === 0 &&
+		allSubscribers.length === 0
+	) {
+		logger.log(
+			'No endpoints, functions, crons, or subscribers found to process',
+		);
+		return {};
+	}
+
+	// Ensure .gkm directory exists
+	const rootOutputDir = join(process.cwd(), '.gkm');
+	await mkdir(rootOutputDir, { recursive: true });
+
+	// Build for each provider and generate per-provider manifests
+	let result: BuildResult = {};
+	for (const provider of resolved.providers) {
+		const providerResult = await buildForProvider(
+			provider,
+			buildContext,
+			rootOutputDir,
+			endpointGenerator,
+			functionGenerator,
+			cronGenerator,
+			subscriberGenerator,
+			allEndpoints,
+			allFunctions,
+			allCrons,
+			allSubscribers,
+			resolved.enableOpenApi,
+			options.skipBundle ?? false,
+			options.stage,
+		);
+		// Keep the master key from the server provider
+		if (providerResult.masterKey) {
+			result = providerResult;
+		}
+	}
+	return result;
 }
 
 async function buildForProvider(
-  provider: LegacyProvider,
-  context: BuildContext,
-  rootOutputDir: string,
-  endpointGenerator: EndpointGenerator,
-  functionGenerator: FunctionGenerator,
-  cronGenerator: CronGenerator,
-  subscriberGenerator: SubscriberGenerator,
-  endpoints: GeneratedConstruct<Endpoint<any, any, any, any, any, any>>[],
-  functions: GeneratedConstruct<Function<any, any, any, any>>[],
-  crons: GeneratedConstruct<Cron<any, any, any, any>>[],
-  subscribers: GeneratedConstruct<Subscriber<any, any, any, any, any, any>>[],
-  enableOpenApi: boolean,
-): Promise<void> {
-  const outputDir = join(process.cwd(), '.gkm', provider);
-
-  // Ensure output directory exists
-  await mkdir(outputDir, { recursive: true });
-
-  logger.log(`\nGenerating handlers for provider: ${provider}`);
-
-  // Build all constructs in parallel
-  const [routes, functionInfos, cronInfos, subscriberInfos] = await Promise.all(
-    [
-      endpointGenerator.build(context, endpoints, outputDir, {
-        provider,
-        enableOpenApi,
-      }),
-      functionGenerator.build(context, functions, outputDir, { provider }),
-      cronGenerator.build(context, crons, outputDir, { provider }),
-      subscriberGenerator.build(context, subscribers, outputDir, { provider }),
-    ],
-  );
-
-  logger.log(
-    `Generated ${routes.length} routes, ${functionInfos.length} functions, ${cronInfos.length} crons, ${subscriberInfos.length} subscribers for ${provider}`,
-  );
-
-  // Generate provider-specific manifest
-  if (provider === 'server') {
-    // For server, collect actual route metadata from endpoint constructs
-    const routeMetadata: RouteInfo[] = await Promise.all(
-      endpoints.map(async ({ construct }) => ({
-        path: construct._path,
-        method: construct.method,
-        handler: '', // Not needed for server manifest
-        authorizer: construct.authorizer?.name ?? 'none',
-      })),
-    );
-
-    const appInfo: ServerAppInfo = {
-      handler: relative(process.cwd(), join(outputDir, 'app.ts')),
-      endpoints: relative(process.cwd(), join(outputDir, 'endpoints.ts')),
-    };
-
-    await generateServerManifest(
-      rootOutputDir,
-      appInfo,
-      routeMetadata,
-      subscriberInfos,
-    );
-  } else {
-    // For AWS providers, generate AWS manifest
-    await generateAwsManifest(
-      rootOutputDir,
-      routes,
-      functionInfos,
-      cronInfos,
-      subscriberInfos,
-    );
-  }
+	provider: LegacyProvider,
+	context: BuildContext,
+	rootOutputDir: string,
+	endpointGenerator: EndpointGenerator,
+	functionGenerator: FunctionGenerator,
+	cronGenerator: CronGenerator,
+	subscriberGenerator: SubscriberGenerator,
+	endpoints: GeneratedConstruct<Endpoint<any, any, any, any, any, any>>[],
+	functions: GeneratedConstruct<Function<any, any, any, any>>[],
+	crons: GeneratedConstruct<Cron<any, any, any, any>>[],
+	subscribers: GeneratedConstruct<Subscriber<any, any, any, any, any, any>>[],
+	enableOpenApi: boolean,
+	skipBundle: boolean,
+	stage?: string,
+): Promise<BuildResult> {
+	const outputDir = join(process.cwd(), '.gkm', provider);
+
+	// Ensure output directory exists
+	await mkdir(outputDir, { recursive: true });
+
+	logger.log(`\nGenerating handlers for provider: ${provider}`);
+
+	// Build all constructs in parallel
+	const [routes, functionInfos, cronInfos, subscriberInfos] = await Promise.all(
+		[
+			endpointGenerator.build(context, endpoints, outputDir, {
+				provider,
+				enableOpenApi,
+			}),
+			functionGenerator.build(context, functions, outputDir, { provider }),
+			cronGenerator.build(context, crons, outputDir, { provider }),
+			subscriberGenerator.build(context, subscribers, outputDir, { provider }),
+		],
+	);
+
+	logger.log(
+		`Generated ${routes.length} routes, ${functionInfos.length} functions, ${cronInfos.length} crons, ${subscriberInfos.length} subscribers for ${provider}`,
+	);
+
+	// Generate provider-specific manifest
+	if (provider === 'server') {
+		// For server, collect actual route metadata from endpoint constructs
+		const routeMetadata: RouteInfo[] = await Promise.all(
+			endpoints.map(async ({ construct }) => ({
+				path: construct._path,
+				method: construct.method,
+				handler: '', // Not needed for server manifest
+				authorizer: construct.authorizer?.name ?? 'none',
+			})),
+		);
+
+		const appInfo: ServerAppInfo = {
+			handler: relative(process.cwd(), join(outputDir, 'app.ts')),
+			endpoints: relative(process.cwd(), join(outputDir, 'endpoints.ts')),
+		};
+
+		await generateServerManifest(
+			rootOutputDir,
+			appInfo,
+			routeMetadata,
+			subscriberInfos,
+		);
+
+		// Bundle for production if enabled
+		let masterKey: string | undefined;
+		if (context.production?.bundle && !skipBundle) {
+			logger.log(`\n📦 Bundling production server...`);
+			const { bundleServer } = await import('./bundler');
+			const bundleResult = await bundleServer({
+				entryPoint: join(outputDir, 'server.ts'),
+				outputDir: join(outputDir, 'dist'),
+				minify: context.production.minify,
+				sourcemap: false,
+				external: context.production.external,
+				stage,
+			});
+			masterKey = bundleResult.masterKey;
+			logger.log(`✅ Bundle complete: .gkm/server/dist/server.mjs`);
+
+			// Display master key if secrets were injected
+			if (masterKey) {
+				logger.log(`\n🔐 Secrets encrypted for deployment`);
+				logger.log(`   Deploy with: GKM_MASTER_KEY=${masterKey}`);
+			}
+		}
+
+		return { masterKey };
+	} else {
+		// For AWS providers, generate AWS manifest
+		await generateAwsManifest(
+			rootOutputDir,
+			routes,
+			functionInfos,
+			cronInfos,
+			subscriberInfos,
+		);
+	}
+
+	return {};
 }

package/src/build/manifests.ts

@@ -1,10 +1,10 @@
 import { mkdir, writeFile } from 'node:fs/promises';
-import { join, relative } from 'path';
+import { join, relative } from 'node:path';
 import type {
-  CronInfo,
-  FunctionInfo,
-  RouteInfo,
-  SubscriberInfo,
+	CronInfo,
+	FunctionInfo,
+	RouteInfo,
+	SubscriberInfo,
 } from '../types';
 
 const logger = console;
@@ -12,24 +12,24 @@ const logger = console;
 export type ManifestProvider = 'aws' | 'server';
 
 export interface ServerAppInfo {
-  handler: string;
-  endpoints: string;
+	handler: string;
+	endpoints: string;
 }
 
 export async function generateAwsManifest(
-  outputDir: string,
-  routes: RouteInfo[],
-  functions: FunctionInfo[],
-  crons: CronInfo[],
-  subscribers: SubscriberInfo[],
+	outputDir: string,
+	routes: RouteInfo[],
+	functions: FunctionInfo[],
+	crons: CronInfo[],
+	subscribers: SubscriberInfo[],
 ): Promise<void> {
-  const manifestDir = join(outputDir, 'manifest');
-  await mkdir(manifestDir, { recursive: true });
+	const manifestDir = join(outputDir, 'manifest');
+	await mkdir(manifestDir, { recursive: true });
 
-  // Filter out 'ALL' method routes (server-specific)
-  const awsRoutes = routes.filter((r) => r.method !== 'ALL');
+	// Filter out 'ALL' method routes (server-specific)
+	const awsRoutes = routes.filter((r) => r.method !== 'ALL');
 
-  const content = `export const manifest = {
+	const content = `export const manifest = {
   routes: ${JSON.stringify(awsRoutes, null, 2)},
   functions: ${JSON.stringify(functions, null, 2)},
   crons: ${JSON.stringify(crons, null, 2)},
@@ -48,40 +48,40 @@ export type HttpMethod = Route['method'];
 export type RoutePath = Route['path'];
 `;
 
-  const manifestPath = join(manifestDir, 'aws.ts');
-  await writeFile(manifestPath, content);
+	const manifestPath = join(manifestDir, 'aws.ts');
+	await writeFile(manifestPath, content);
 
-  logger.log(
-    `Generated AWS manifest with ${awsRoutes.length} routes, ${functions.length} functions, ${crons.length} crons, ${subscribers.length} subscribers`,
-  );
-  logger.log(`Manifest: ${relative(process.cwd(), manifestPath)}`);
+	logger.log(
+		`Generated AWS manifest with ${awsRoutes.length} routes, ${functions.length} functions, ${crons.length} crons, ${subscribers.length} subscribers`,
+	);
+	logger.log(`Manifest: ${relative(process.cwd(), manifestPath)}`);
 }
 
 export async function generateServerManifest(
-  outputDir: string,
-  appInfo: ServerAppInfo,
-  routes: RouteInfo[],
-  subscribers: SubscriberInfo[],
+	outputDir: string,
+	appInfo: ServerAppInfo,
+	routes: RouteInfo[],
+	subscribers: SubscriberInfo[],
 ): Promise<void> {
-  const manifestDir = join(outputDir, 'manifest');
-  await mkdir(manifestDir, { recursive: true });
-
-  // For server, extract route metadata (path, method, authorizer)
-  const serverRoutes = routes
-    .filter((r) => r.method !== 'ALL')
-    .map((r) => ({
-      path: r.path,
-      method: r.method,
-      authorizer: r.authorizer,
-    }));
-
-  // Server subscribers only need name and events
-  const serverSubscribers = subscribers.map((s) => ({
-    name: s.name,
-    subscribedEvents: s.subscribedEvents,
-  }));
-
-  const content = `export const manifest = {
+	const manifestDir = join(outputDir, 'manifest');
+	await mkdir(manifestDir, { recursive: true });
+
+	// For server, extract route metadata (path, method, authorizer)
+	const serverRoutes = routes
+		.filter((r) => r.method !== 'ALL')
+		.map((r) => ({
+			path: r.path,
+			method: r.method,
+			authorizer: r.authorizer,
+		}));
+
+	// Server subscribers only need name and events
+	const serverSubscribers = subscribers.map((s) => ({
+		name: s.name,
+		subscribedEvents: s.subscribedEvents,
+	}));
+
+	const content = `export const manifest = {
   app: ${JSON.stringify(appInfo, null, 2)},
   routes: ${JSON.stringify(serverRoutes, null, 2)},
   subscribers: ${JSON.stringify(serverSubscribers, null, 2)},
@@ -97,11 +97,11 @@ export type HttpMethod = Route['method'];
 export type RoutePath = Route['path'];
 `;
 
-  const manifestPath = join(manifestDir, 'server.ts');
-  await writeFile(manifestPath, content);
+	const manifestPath = join(manifestDir, 'server.ts');
+	await writeFile(manifestPath, content);
 
-  logger.log(
-    `Generated server manifest with ${serverRoutes.length} routes, ${serverSubscribers.length} subscribers`,
-  );
-  logger.log(`Manifest: ${relative(process.cwd(), manifestPath)}`);
+	logger.log(
+		`Generated server manifest with ${serverRoutes.length} routes, ${serverSubscribers.length} subscribers`,
+	);
+	logger.log(`Manifest: ${relative(process.cwd(), manifestPath)}`);
 }