genbox 1.0.47 → 1.0.49

package/dist/config-loader.js

@@ -4,10 +4,7 @@
  *
  * Loads genbox.yaml from the CURRENT directory only.
  * No parent directory lookup - each project is self-contained.
- *
- * Additional sources (merged with project config):
- * - User profiles (~/.genbox/profiles.yaml)
- * - User defaults (~/.genbox/config.json)
+ * Only supports v4 configuration format.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -44,7 +41,6 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configLoader = exports.ConfigLoader = void 0;
-exports.isV4 = isV4;
 exports.getProfileConnection = getProfileConnection;
 exports.getAppDependencies = getAppDependencies;
 exports.getInfrastructure = getInfrastructure;
@@ -52,33 +48,20 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const yaml = __importStar(require("js-yaml"));
 const os = __importStar(require("os"));
-const schema_v4_1 = require("./schema-v4");
-// Helper to check if config is v4
-function isV4(config) {
-    return (0, schema_v4_1.getConfigVersion)(config) === 4;
-}
-// Helper to get profile connection (handles both v3 and v4)
+// Helper to get profile connection
 function getProfileConnection(profile) {
-    // v4 uses default_connection, v3 uses connect_to
-    return profile.default_connection || profile.connect_to;
+    return profile.default_connection;
 }
-// Helper to get app dependencies (handles both v3 and v4)
+// Helper to get app dependencies
 function getAppDependencies(app) {
-    // v4 uses connects_to, v3 uses requires
     if (app.connects_to) {
         return Object.keys(app.connects_to);
     }
-    if (app.requires) {
-        return Object.keys(app.requires);
-    }
     return [];
 }
-// Helper to get infrastructure/provides (handles both v3 and v4)
+// Helper to get infrastructure/provides
 function getInfrastructure(config) {
-    if (isV4(config)) {
-        return config.provides;
-    }
-    return config.infrastructure;
+    return config.provides;
 }
 const CONFIG_FILENAME = 'genbox.yaml';
 const ENV_FILENAME = '.env.genbox';
@@ -102,16 +85,18 @@ class ConfigLoader {
         // Merge configurations
         const mergedConfig = this.mergeConfigs(sources, userConfig);
         // Validate
-        const validation = this.validate(mergedConfig);
-        if (!validation.valid) {
-            warnings.push(...validation.errors.map(e => e.message));
+        if (mergedConfig) {
+            const validation = this.validate(mergedConfig);
+            if (!validation.valid) {
+                warnings.push(...validation.errors.map(e => e.message));
+            }
+            warnings.push(...validation.warnings.map(w => w.message));
         }
-        warnings.push(...validation.warnings.map(w => w.message));
         // Root is current directory
         const root = projectConfig?.path ? path.dirname(projectConfig.path) : cwd;
         return {
             found: sources.length > 0,
-            config: sources.length > 0 ? mergedConfig : null,
+            config: mergedConfig,
             sources,
             warnings,
             isWorkspace: false,
@@ -129,6 +114,12 @@ class ConfigLoader {
         try {
             const content = fs.readFileSync(configPath, 'utf8');
             const config = yaml.load(content);
+            // Validate it's v4
+            if (config.version !== 4) {
+                console.warn(`Warning: Config version ${config.version} is not supported. Only v4 is supported.`);
+                console.warn('Run "genbox init" to create a new v4 configuration.');
+                return null;
+            }
             return {
                 type: 'project',
                 path: configPath,
@@ -173,43 +164,27 @@ class ConfigLoader {
         }
     }
     /**
-     * Merge configurations from all sources
-     * Supports both v3 and v4 config formats
+     * Merge configurations from all sources (v4 only)
      */
     mergeConfigs(sources, userConfig) {
-        // Detect version from first source that has it
-        let isVersion4 = false;
-        for (const source of sources) {
-            // Version can be number (v4) or string (v3)
-            if (source.config.version === 4) {
-                isVersion4 = true;
-                break;
-            }
+        if (sources.length === 0) {
+            return null;
         }
-        // Start with appropriate default structure
-        const merged = isVersion4
-            ? {
-                version: 4,
-                project: {
-                    name: 'unnamed',
-                    structure: 'single-app',
-                },
-                apps: {},
-                strict: {
-                    enabled: true,
-                    allow_detect: true,
-                    warnings_as_errors: false,
-                },
-            }
-            : {
-                version: '3.0',
-                project: {
-                    name: 'unnamed',
-                    structure: 'single-app',
-                },
-                apps: {},
-            };
-        // Merge sources in order (workspace first, then project)
+        // Start with v4 default structure
+        const merged = {
+            version: 4,
+            project: {
+                name: 'unnamed',
+                structure: 'single-app',
+            },
+            apps: {},
+            strict: {
+                enabled: true,
+                allow_detect: true,
+                warnings_as_errors: false,
+            },
+        };
+        // Merge sources in order
         for (const source of sources) {
             this.deepMerge(merged, source.config);
         }
@@ -232,10 +207,6 @@ class ConfigLoader {
     }
     /**
      * Deep merge objects
-     *
-     * Special handling:
-     * - 'version' field is never overwritten (prevents v4 -> v1 downgrades)
-     * - Empty objects don't overwrite non-empty objects
      */
     deepMerge(target, source) {
         for (const key of Object.keys(source)) {
@@ -243,7 +214,7 @@ class ConfigLoader {
             const targetValue = target[key];
             if (sourceValue === undefined)
                 continue;
-            // Never overwrite version field - workspace config takes precedence
+            // Never overwrite version field
             if (key === 'version' && targetValue !== undefined)
                 continue;
             // Don't overwrite non-empty objects with empty objects
@@ -255,7 +226,6 @@ class ConfigLoader {
                 targetValue !== null &&
                 !Array.isArray(targetValue) &&
                 Object.keys(targetValue).length > 0) {
-                // Skip - don't let empty {} overwrite populated object
                 continue;
             }
             if (typeof sourceValue === 'object' &&
@@ -272,12 +242,19 @@ class ConfigLoader {
         }
     }
     /**
-     * Validate configuration (supports both v3 and v4)
+     * Validate configuration (v4 only)
      */
     validate(config) {
         const errors = [];
         const warnings = [];
-        const configIsV4 = isV4(config);
+        // Check version
+        if (config.version !== 4) {
+            errors.push({
+                path: 'version',
+                message: `Config version ${config.version} is not supported. Only v4 is supported.`,
+                severity: 'error',
+            });
+        }
         // Required fields
         if (!config.project?.name) {
             errors.push({
@@ -293,8 +270,7 @@ class ConfigLoader {
                 severity: 'warning',
             });
         }
-        // Get infrastructure (v4: provides, v3: infrastructure)
-        const infra = getInfrastructure(config);
+        const infra = config.provides;
         // Validate apps
         for (const [name, app] of Object.entries(config.apps || {})) {
             if (!app.path) {
@@ -311,16 +287,15 @@ class ConfigLoader {
                     severity: 'warning',
                 });
             }
-            // Validate dependencies (v4: connects_to, v3: requires)
+            // Validate dependencies
             const deps = getAppDependencies(app);
-            const depField = configIsV4 ? 'connects_to' : 'requires';
             for (const dep of deps) {
                 const isAppDep = config.apps?.[dep];
                 const isInfraDep = infra?.[dep];
                 if (!isAppDep && !isInfraDep) {
                     warnings.push({
-                        path: `apps.${name}.${depField}.${dep}`,
-                        message: `App '${name}' ${configIsV4 ? 'connects to' : 'requires'} '${dep}' which is not defined`,
+                        path: `apps.${name}.connects_to.${dep}`,
+                        message: `App '${name}' connects to '${dep}' which is not defined`,
                         severity: 'warning',
                     });
                 }
@@ -328,7 +303,6 @@ class ConfigLoader {
         }
         // Validate profiles
         for (const [name, profile] of Object.entries(config.profiles || {})) {
-            // Check apps exist
             for (const appName of profile.apps || []) {
                 if (!config.apps?.[appName]) {
                     errors.push({
@@ -338,7 +312,6 @@ class ConfigLoader {
                     });
                 }
             }
-            // Check extends
             if (profile.extends && !config.profiles?.[profile.extends]) {
                 errors.push({
                     path: `profiles.${name}.extends`,
@@ -346,12 +319,10 @@ class ConfigLoader {
                     severity: 'error',
                 });
             }
-            // Check connection (v4: default_connection, v3: connect_to)
-            const connection = getProfileConnection(profile);
+            const connection = profile.default_connection;
             if (connection && !config.environments?.[connection]) {
-                const connField = configIsV4 ? 'default_connection' : 'connect_to';
                 warnings.push({
-                    path: `profiles.${name}.${connField}`,
+                    path: `profiles.${name}.default_connection`,
                     message: `Profile '${name}' connects to undefined environment '${connection}'`,
                     severity: 'warning',
                 });
@@ -359,37 +330,20 @@ class ConfigLoader {
         }
         // Validate environments
         for (const [name, env] of Object.entries(config.environments || {})) {
-            // Check for unresolved variable references
-            const checkValue = (value, path) => {
-                if (typeof value === 'string' && value.includes('${')) {
-                    const match = value.match(/\$\{([^}]+)\}/);
-                    if (match) {
-                        warnings.push({
-                            path,
-                            message: `Environment '${name}' has variable reference '${match[1]}' - ensure it's defined in .env.genbox`,
-                            severity: 'warning',
-                        });
-                    }
-                }
-            };
-            // v4 uses urls object, v3 uses separate mongodb/redis/rabbitmq objects
-            if (configIsV4) {
-                const v4Env = env;
-                if (v4Env.urls) {
-                    for (const [key, url] of Object.entries(v4Env.urls)) {
-                        checkValue(url, `environments.${name}.urls.${key}`);
+            if (env.urls) {
+                for (const [key, url] of Object.entries(env.urls)) {
+                    if (typeof url === 'string' && url.includes('${')) {
+                        const match = url.match(/\$\{([^}]+)\}/);
+                        if (match) {
+                            warnings.push({
+                                path: `environments.${name}.urls.${key}`,
+                                message: `Environment '${name}' has variable reference '${match[1]}' - ensure it's defined in .env.genbox`,
+                                severity: 'warning',
+                            });
+                        }
                     }
                 }
             }
-            else {
-                const v3Env = env;
-                if (v3Env.mongodb?.url)
-                    checkValue(v3Env.mongodb.url, `environments.${name}.mongodb.url`);
-                if (v3Env.redis?.url)
-                    checkValue(v3Env.redis.url, `environments.${name}.redis.url`);
-                if (v3Env.rabbitmq?.url)
-                    checkValue(v3Env.rabbitmq.url, `environments.${name}.rabbitmq.url`);
-            }
         }
         return {
             valid: errors.length === 0,
@@ -398,12 +352,11 @@ class ConfigLoader {
         };
     }
     /**
-     * Get a specific profile, resolving extends (supports both v3 and v4)
+     * Get a specific profile, resolving extends
      */
     getProfile(config, profileName) {
         const profile = config.profiles?.[profileName];
         if (!profile) {
-            // Check user profiles
             const userProfiles = this.loadUserProfiles();
             if (userProfiles?.profiles?.[profileName]) {
                 return this.resolveProfile(config, userProfiles.profiles[profileName], userProfiles);
@@ -413,13 +366,12 @@ class ConfigLoader {
         return this.resolveProfile(config, profile);
     }
     /**
-     * Resolve profile inheritance (extends) - supports both v3 and v4
+     * Resolve profile inheritance (extends)
      */
     resolveProfile(config, profile, userProfiles) {
         if (!profile.extends) {
             return profile;
         }
-        // Find parent profile
         let parent = config.profiles?.[profile.extends];
         if (!parent && userProfiles) {
             parent = userProfiles.profiles?.[profile.extends];
@@ -428,47 +380,26 @@ class ConfigLoader {
             console.warn(`Warning: Profile extends '${profile.extends}' which doesn't exist`);
             return profile;
         }
-        // Resolve parent first (recursive)
         const resolvedParent = this.resolveProfile(config, parent, userProfiles);
-        // Merge parent into child - handle both v3 and v4
-        const merged = {
+        return {
             ...resolvedParent,
             ...profile,
-            // Arrays are replaced, not merged
             apps: profile.apps || resolvedParent.apps,
-            // Objects are merged
             env: {
                 ...resolvedParent.env,
                 ...profile.env,
             },
+            connections: {
+                ...resolvedParent.connections,
+                ...profile.connections,
+            },
         };
-        // Handle v4 connections override
-        if (isV4(config)) {
-            const v4Profile = profile;
-            const v4Parent = resolvedParent;
-            merged.connections = {
-                ...v4Parent.connections,
-                ...v4Profile.connections,
-            };
-        }
-        else {
-            // v3 infrastructure merge
-            const v3Profile = profile;
-            const v3Parent = resolvedParent;
-            merged.infrastructure = {
-                ...v3Parent.infrastructure,
-                ...v3Profile.infrastructure,
-            };
-        }
-        return merged;
     }
     /**
-     * List all available profiles (supports both v3 and v4)
+     * List all available profiles
      */
     listProfiles(config) {
         const profiles = [];
-        // Project profiles only (user/global profiles removed - they don't make sense
-        // because profiles reference project-specific app names)
         for (const [name, profile] of Object.entries(config.profiles || {})) {
             const resolved = this.getProfile(config, name);
             profiles.push({
@@ -477,7 +408,7 @@ class ConfigLoader {
                 source: 'project',
                 apps: resolved?.apps || [],
                 size: resolved?.size,
-                connection: resolved ? getProfileConnection(resolved) : undefined,
+                connection: resolved?.default_connection,
             });
         }
         return profiles;
@@ -486,11 +417,9 @@ class ConfigLoader {
      * Save user profile
      */
     saveUserProfile(name, profile) {
-        // Ensure directory exists
         if (!fs.existsSync(USER_CONFIG_DIR)) {
             fs.mkdirSync(USER_CONFIG_DIR, { recursive: true });
         }
-        // Load existing profiles
         let profiles = { profiles: {} };
         if (fs.existsSync(USER_PROFILES_FILE)) {
             try {
@@ -499,9 +428,7 @@ class ConfigLoader {
             }
             catch { }
         }
-        // Add/update profile
         profiles.profiles[name] = profile;
-        // Save
         const content = yaml.dump(profiles, { lineWidth: 120 });
         fs.writeFileSync(USER_PROFILES_FILE, content);
     }
@@ -510,10 +437,9 @@ class ConfigLoader {
      */
     loadEnvVars(root) {
         const vars = {};
-        // Load from multiple locations
         const envPaths = [
             path.join(root, ENV_FILENAME),
-            path.join(path.dirname(root), ENV_FILENAME), // Workspace level
+            path.join(path.dirname(root), ENV_FILENAME),
         ];
         for (const envPath of envPaths) {
             if (fs.existsSync(envPath)) {
@@ -532,13 +458,11 @@ class ConfigLoader {
         const lines = content.split('\n');
         for (const line of lines) {
             const trimmed = line.trim();
-            // Skip comments and empty lines
             if (!trimmed || trimmed.startsWith('#'))
                 continue;
             const match = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/);
             if (match) {
                 let [, key, value] = match;
-                // Remove quotes
                 if ((value.startsWith('"') && value.endsWith('"')) ||
                     (value.startsWith("'") && value.endsWith("'"))) {
                     value = value.slice(1, -1);