@buenojs/bueno 0.8.3 → 0.8.5

package/src/config/env.ts

@@ -2,9 +2,9 @@
  * Environment variable handling for Bueno Framework
  */
 
+import { setNestedValue } from "./merge";
 import type { BuenoConfig, DeepPartial, EnvMapping } from "./types";
 import { ENV_MAPPINGS } from "./types";
-import { setNestedValue } from "./merge";
 
 /**
  * Environment variable source information
@@ -168,6 +168,113 @@ export async function loadEnvFiles(options?: {
 	return result;
 }
 
+// ============= Environment Variable Validation =============
+
+/**
+ * Validate environment variables before loading
+ *
+ * @param envVars - Environment variables to validate
+ * @returns Validation result with transformed values or error details
+ */
+export async function validateEnvVars(
+	envVars: Record<string, string>,
+): Promise<ValidationResult> {
+	try {
+		const { validateEnvVars } = await import("./env-validation");
+		return validateEnvVars(envVars);
+	} catch (error) {
+		return {
+			success: false,
+			issues: [
+				{
+					message: `Failed to validate environment variables: ${error instanceof Error ? error.message : "Unknown error"}`,
+				},
+			],
+		};
+	}
+}
+
+/**
+ * Load and validate environment variables with detailed error reporting
+ *
+ * @param options - Options for loading and validating environment variables
+ * @returns Loaded environment data with validation result
+ */
+export async function loadAndValidateEnv(options?: {
+	/** Custom list of env files to load */
+	files?: string[];
+	/** Whether to also load NODE_ENV-specific file */
+	loadNodeEnv?: boolean;
+	/** Base directory for env files */
+	cwd?: string;
+	/** Whether to merge with existing Bun.env */
+	mergeWithProcess?: boolean;
+	/** Custom environment variable mappings */
+	mappings?: EnvMapping[];
+}): Promise<{ loaded: LoadedEnv; valid: boolean; errors?: string }> {
+	try {
+		// Load environment variables from files
+		const fileVars = await loadEnvFiles(options);
+
+		// Validate the environment variables
+		const validationResult = await validateEnvVars(fileVars);
+
+		// Merge with Bun.env if requested
+		const raw: Record<string, string> =
+			options?.mergeWithProcess !== false
+				? {
+						...fileVars,
+						...Object.fromEntries(
+							Object.entries(Bun.env).filter(([, v]) => v !== undefined) as [
+								string,
+								string,
+							][],
+						),
+					}
+				: fileVars;
+
+		// Transform to config
+		const config = envToConfig(raw, options?.mappings);
+
+		// Track sources
+		const sources = new Map<string, EnvSourceInfo>();
+		for (const [name, value] of Object.entries(raw)) {
+			sources.set(name, {
+				name,
+				value,
+				source: fileVars[name] !== undefined ? ".env file" : "process",
+			});
+		}
+
+		// Set loaded vars to Bun.env
+		for (const [key, value] of Object.entries(fileVars)) {
+			if (Bun.env[key] === undefined) {
+				Bun.env[key] = value;
+			}
+		}
+
+		const loaded: LoadedEnv = { raw, config, sources };
+
+		if (!validationResult.success) {
+			return {
+				loaded,
+				valid: false,
+				errors: validationResult.issues
+					.map((issue) => issue.message)
+					.join("\n"),
+			};
+		}
+
+		return { loaded, valid: true };
+	} catch (error) {
+		return {
+			loaded: { raw: {}, config: {}, sources: new Map() },
+			valid: false,
+			errors: `Failed to load and validate environment variables: ${error instanceof Error ? error.message : "Unknown error"}`,
+		};
+	}
+}
+
 /**
  * Get environment variable value from Bun.env
  */
@@ -233,36 +340,18 @@ export async function loadEnv(options?: {
 	/** Custom environment variable mappings */
 	mappings?: EnvMapping[];
 }): Promise<LoadedEnv> {
-	// Load from .env files
-	const fileVars = await loadEnvFiles(options);
-
-	// Merge with Bun.env if requested
-	const raw: Record<string, string> =
-		options?.mergeWithProcess !== false
-			? { ...fileVars, ...Object.fromEntries(Object.entries(Bun.env).filter(([, v]) => v !== undefined) as [string, string][]) }
-			: fileVars;
-
-	// Transform to config
-	const config = envToConfig(raw, options?.mappings);
-
-	// Track sources
-	const sources = new Map<string, EnvSourceInfo>();
-	for (const [name, value] of Object.entries(raw)) {
-		sources.set(name, {
-			name,
-			value,
-			source: fileVars[name] !== undefined ? ".env file" : "process",
-		});
+	// Load and validate environment variables
+	const result = await loadAndValidateEnv(options);
+
+	if (!result.valid) {
+		console.error("Environment variable validation failed:");
+		console.error(result.errors);
+		throw new Error(
+			"Environment variable validation failed. Check the error messages above.",
+		);
 	}
 
-	// Set loaded vars to Bun.env
-	for (const [key, value] of Object.entries(fileVars)) {
-		if (Bun.env[key] === undefined) {
-			Bun.env[key] = value;
-		}
-	}
-
-	return { raw, config, sources };
+	return result.loaded;
 }
 
 /**
@@ -324,7 +413,7 @@ export function parseEnvBoolean(value: string): boolean {
  * Parse a number environment variable
  */
 export function parseEnvNumber(value: string): number {
-	const num = parseInt(value, 10);
+	const num = Number.parseInt(value, 10);
 	if (isNaN(num)) {
 		throw new Error(`Invalid number: ${value}`);
 	}
@@ -351,22 +440,58 @@ export function parseEnvArray(value: string): string[] {
 export const envConfigMapping: EnvConfigMapping[] = [
 	{ envVar: "BUENO_PORT", configKey: "server.port", transform: parseEnvNumber },
 	{ envVar: "BUENO_HOST", configKey: "server.host" },
-	{ envVar: "BUENO_DEV", configKey: "server.development", transform: parseEnvBoolean },
+	{
+		envVar: "BUENO_DEV",
+		configKey: "server.development",
+		transform: parseEnvBoolean,
+	},
 	{ envVar: "DATABASE_URL", configKey: "database.url" },
-	{ envVar: "DATABASE_POOL_SIZE", configKey: "database.poolSize", transform: parseEnvNumber },
+	{
+		envVar: "DATABASE_POOL_SIZE",
+		configKey: "database.poolSize",
+		transform: parseEnvNumber,
+	},
 	{ envVar: "REDIS_URL", configKey: "cache.url" },
 	{ envVar: "CACHE_DRIVER", configKey: "cache.driver" },
 	{ envVar: "CACHE_TTL", configKey: "cache.ttl", transform: parseEnvNumber },
 	{ envVar: "LOG_LEVEL", configKey: "logger.level" },
-	{ envVar: "LOG_PRETTY", configKey: "logger.pretty", transform: parseEnvBoolean },
-	{ envVar: "HEALTH_ENABLED", configKey: "health.enabled", transform: parseEnvBoolean },
-	{ envVar: "METRICS_ENABLED", configKey: "metrics.enabled", transform: parseEnvBoolean },
-	{ envVar: "TELEMETRY_ENABLED", configKey: "telemetry.enabled", transform: parseEnvBoolean },
+	{
+		envVar: "LOG_PRETTY",
+		configKey: "logger.pretty",
+		transform: parseEnvBoolean,
+	},
+	{
+		envVar: "HEALTH_ENABLED",
+		configKey: "health.enabled",
+		transform: parseEnvBoolean,
+	},
+	{
+		envVar: "METRICS_ENABLED",
+		configKey: "metrics.enabled",
+		transform: parseEnvBoolean,
+	},
+	{
+		envVar: "TELEMETRY_ENABLED",
+		configKey: "telemetry.enabled",
+		transform: parseEnvBoolean,
+	},
 	{ envVar: "TELEMETRY_SERVICE_NAME", configKey: "telemetry.serviceName" },
 	{ envVar: "TELEMETRY_ENDPOINT", configKey: "telemetry.endpoint" },
-	{ envVar: "FRONTEND_DEV_SERVER", configKey: "frontend.devServer", transform: parseEnvBoolean },
-	{ envVar: "FRONTEND_HMR", configKey: "frontend.hmr", transform: parseEnvBoolean },
-	{ envVar: "FRONTEND_PORT", configKey: "frontend.port", transform: parseEnvNumber },
+	{
+		envVar: "FRONTEND_DEV_SERVER",
+		configKey: "frontend.devServer",
+		transform: parseEnvBoolean,
+	},
+	{
+		envVar: "FRONTEND_HMR",
+		configKey: "frontend.hmr",
+		transform: parseEnvBoolean,
+	},
+	{
+		envVar: "FRONTEND_PORT",
+		configKey: "frontend.port",
+		transform: parseEnvNumber,
+	},
 ];
 
 /**
@@ -396,7 +521,10 @@ export function getEnvConfig(
 /**
  * Get an environment variable value
  */
-export function getEnvValue(key: string, defaultValue?: string): string | undefined {
+export function getEnvValue(
+	key: string,
+	defaultValue?: string,
+): string | undefined {
 	return Bun.env[key] ?? defaultValue;
 }
 
@@ -405,4 +533,4 @@ export function getEnvValue(key: string, defaultValue?: string): string | undefi
  */
 export function setEnvValue(key: string, value: string): void {
 	Bun.env[key] = value;
-}
+}

package/src/config/index.ts

@@ -19,6 +19,9 @@ export type {
 	MetricsConfig,
 	TelemetryConfig,
 	FrontendConfig,
+	JobsConfig,
+	NotificationConfig,
+	I18nConfig,
 	DeepPartial,
 	UserConfig,
 	UserConfigFn,
@@ -70,21 +73,21 @@ export {
 } from "./validation";
 
 import type { StandardSchema } from "../types";
+import { getEnvConfig, loadEnv } from "./env";
+import { clearConfigCache, findConfigFile, loadConfig } from "./loader";
+import { deepMerge, mergeConfigs } from "./merge";
 import type {
 	BuenoConfig,
 	DeepPartial,
+	InferConfig,
 	UserConfig,
 	UserConfigFn,
-	InferConfig,
 } from "./types";
-import { deepMerge, mergeConfigs } from "./merge";
-import { loadEnv, getEnvConfig } from "./env";
-import { loadConfig, findConfigFile, clearConfigCache } from "./loader";
 import {
+	type ConfigValidationResult,
+	assertValidConfig,
 	validateConfig,
 	validateConfigSync,
-	assertValidConfig,
-	type ConfigValidationResult,
 } from "./validation";
 
 /**
@@ -178,9 +181,9 @@ export class ConfigManager<T extends BuenoConfig = BuenoConfig> {
 
 	constructor(options: ConfigManagerOptions<T> = {}) {
 		this.options = options;
-		this.config = (options.useDefaults !== false
-			? { ...DEFAULT_CONFIG }
-			: {}) as T;
+		this.config = (
+			options.useDefaults !== false ? { ...DEFAULT_CONFIG } : {}
+		) as T;
 
 		// Apply initial config if provided
 		if (options.config) {
@@ -212,10 +215,10 @@ export class ConfigManager<T extends BuenoConfig = BuenoConfig> {
 		// Merge all sources
 		const merged = mergeConfigs(
 			{} as T,
-			this.options.useDefaults !== false ? DEFAULT_CONFIG : {} as T,
+			this.options.useDefaults !== false ? DEFAULT_CONFIG : ({} as T),
 			fileConfig as T,
 			envConfig as T,
-			this.options.config as T || {} as T,
+			(this.options.config as T) || ({} as T),
 		);
 
 		this.config = merged as T;
@@ -270,7 +273,10 @@ export class ConfigManager<T extends BuenoConfig = BuenoConfig> {
 	set(key: string, value: unknown): void;
 	set(key: string, value: unknown): void {
 		const parts = key.split(".");
-		let current: Record<string, unknown> = this.config as Record<string, unknown>;
+		let current: Record<string, unknown> = this.config as Record<
+			string,
+			unknown
+		>;
 
 		for (let i = 0; i < parts.length - 1; i++) {
 			const part = parts[i];
@@ -320,7 +326,9 @@ export class ConfigManager<T extends BuenoConfig = BuenoConfig> {
 	 * Validate synchronously (only default rules)
 	 */
 	validateSync(): ConfigValidationResult {
-		return validateConfigSync(this.config as unknown as DeepPartial<BuenoConfig>);
+		return validateConfigSync(
+			this.config as unknown as DeepPartial<BuenoConfig>,
+		);
 	}
 
 	/**
@@ -452,9 +460,9 @@ export function defineConfigFn<T extends BuenoConfig = BuenoConfig>(
  * const config = await createConfigManager();
  * const port = config.get('server.port');
  */
-export async function createConfigManager<
-	T extends BuenoConfig = BuenoConfig,
->(options?: ConfigManagerOptions<T>): Promise<ConfigManager<T>> {
+export async function createConfigManager<T extends BuenoConfig = BuenoConfig>(
+	options?: ConfigManagerOptions<T>,
+): Promise<ConfigManager<T>> {
 	const manager = new ConfigManager<T>(options);
 	await manager.load();
 	return manager;
@@ -478,9 +486,9 @@ export function createConfigManagerSync<T extends BuenoConfig = BuenoConfig>(
  * const config = await loadConfigDirect();
  * console.log(config.server?.port);
  */
-export async function loadConfigDirect<
-	T extends BuenoConfig = BuenoConfig,
->(options?: ConfigManagerOptions<T>): Promise<T> {
+export async function loadConfigDirect<T extends BuenoConfig = BuenoConfig>(
+	options?: ConfigManagerOptions<T>,
+): Promise<T> {
 	const manager = await createConfigManager<T>(options);
 	return manager.getAll();
 }
@@ -503,4 +511,4 @@ export function getConfigManager(): ConfigManager {
  */
 export function setConfigManager(manager: ConfigManager): void {
 	defaultManager = manager;
-}
+}

package/src/config/loader.ts

@@ -3,8 +3,13 @@
  * Uses Bun's native TypeScript loader to import config files
  */
 
-import type { BuenoConfig, DeepPartial, UserConfig, UserConfigFn } from "./types";
 import { deepMerge } from "./merge";
+import type {
+	BuenoConfig,
+	DeepPartial,
+	UserConfig,
+	UserConfigFn,
+} from "./types";
 
 /**
  * Configuration file search order
@@ -74,7 +79,9 @@ export function clearConfigCache(): void {
 /**
  * Get cached config
  */
-export function getCachedConfig(path: string): DeepPartial<BuenoConfig> | undefined {
+export function getCachedConfig(
+	path: string,
+): DeepPartial<BuenoConfig> | undefined {
 	return configCache.get(path);
 }
 
@@ -152,18 +159,18 @@ export async function loadConfigFile<T extends BuenoConfig = BuenoConfig>(
  * Load configuration from file
  * Searches for config files in order and loads the first one found
  */
-export async function loadConfig<T extends BuenoConfig = BuenoConfig>(
-	options?: {
-		/** Custom config file path */
-		configPath?: string;
-		/** Working directory to search for config */
-		cwd?: string;
-		/** Whether to use cache */
-		useCache?: boolean;
-		/** Additional context to pass to config function */
-		context?: Record<string, unknown>;
-	},
-): Promise<LoadedConfig> {
+export async function loadConfig<
+	T extends BuenoConfig = BuenoConfig,
+>(options?: {
+	/** Custom config file path */
+	configPath?: string;
+	/** Working directory to search for config */
+	cwd?: string;
+	/** Whether to use cache */
+	useCache?: boolean;
+	/** Additional context to pass to config function */
+	context?: Record<string, unknown>;
+}): Promise<LoadedConfig> {
 	// If a specific path is provided, use it
 	if (options?.configPath) {
 		return loadConfigFile<T>(options.configPath, {
@@ -306,7 +313,9 @@ export function validateConfigStructure(
 /**
  * Extract config file path from CLI args
  */
-export function getConfigPathFromArgs(args: string[] = process.argv): string | undefined {
+export function getConfigPathFromArgs(
+	args: string[] = process.argv,
+): string | undefined {
 	const configIndex = args.indexOf("--config");
 	if (configIndex !== -1 && args[configIndex + 1]) {
 		return args[configIndex + 1];
@@ -326,4 +335,4 @@ export function getConfigPathFromArgs(args: string[] = process.argv): string | u
  */
 export function getConfigPathFromEnv(): string | undefined {
 	return Bun.env.BUENO_CONFIG;
-}
+}

package/src/config/merge.ts

@@ -7,7 +7,9 @@ import type { BuenoConfig, DeepPartial } from "./types";
 /**
  * Check if a value is a plain object (not an array, not null, not a class instance)
  */
-export function isPlainObject(value: unknown): value is Record<string, unknown> {
+export function isPlainObject(
+	value: unknown,
+): value is Record<string, unknown> {
 	if (value === null || typeof value !== "object") {
 		return false;
 	}
@@ -60,7 +62,10 @@ export function deepMerge<T>(target: T, source: DeepPartial<T>): T {
 
 		if (isPlainObject(sourceValue) && isPlainObject(targetValue)) {
 			// Both are objects, merge recursively
-			result[key] = deepMerge(targetValue, sourceValue as DeepPartial<typeof targetValue>);
+			result[key] = deepMerge(
+				targetValue,
+				sourceValue as DeepPartial<typeof targetValue>,
+			);
 		} else if (Array.isArray(sourceValue) && Array.isArray(targetValue)) {
 			// Both are arrays, concatenate them
 			result[key] = [...targetValue, ...sourceValue];
@@ -80,13 +85,19 @@ export function deepMerge<T>(target: T, source: DeepPartial<T>): T {
 export function mergeConfigs<T extends BuenoConfig = BuenoConfig>(
 	...configs: (DeepPartial<T> | undefined | null)[]
 ): DeepPartial<T> {
-	return configs.reduce<DeepPartial<T>>((acc, config) => {
-		if (config === undefined || config === null) {
-			return acc;
-		}
-		// Use unknown as intermediate type to avoid recursive type issues
-		return deepMerge(acc as unknown as T, config as unknown as DeepPartial<T>) as unknown as DeepPartial<T>;
-	}, {} as DeepPartial<T>);
+	return configs.reduce<DeepPartial<T>>(
+		(acc, config) => {
+			if (config === undefined || config === null) {
+				return acc;
+			}
+			// Use unknown as intermediate type to avoid recursive type issues
+			return deepMerge(
+				acc as unknown as T,
+				config as unknown as DeepPartial<T>,
+			) as unknown as DeepPartial<T>;
+		},
+		{} as DeepPartial<T>,
+	);
 }
 
 /**
@@ -282,4 +293,4 @@ export function diffConfigs(
 	}
 
 	return { added, removed, changed };
-}
+}