genbox 1.0.14 → 1.0.15

package/dist/profile-resolver.js

@@ -56,9 +56,11 @@ class ProfileResolver {
     }
     /**
      * Resolve configuration from options (CLI flags, profile, interactive)
+     * Supports both v3 and v4 configs
      */
     async resolve(config, options) {
         const warnings = [];
+        const isV4Config = (0, config_loader_1.isV4)(config);
         // Step 1: Get base profile (if specified)
         let profile = {};
         if (options.profile) {
@@ -107,13 +109,13 @@ class ProfileResolver {
             size,
             project: {
                 name: config.project.name,
-                structure: config.project.structure,
+                structure: (config.project.structure === '$detect' ? 'single-app' : config.project.structure),
             },
             apps,
             infrastructure,
             database,
             repos: this.resolveRepos(config, apps),
-            env: this.resolveEnvVars(config, apps, infrastructure, database, profile.connect_to),
+            env: this.resolveEnvVars(config, apps, infrastructure, database, (0, config_loader_1.getProfileConnection)(profile)),
             hooks: config.hooks || {},
             profile: options.profile,
             warnings,
@@ -150,8 +152,8 @@ class ProfileResolver {
         const resolvedInfra = [];
         const warnings = [];
         const processedDeps = new Set();
-        // Default environment for dependencies
-        const defaultEnv = profile.connect_to || options.api;
+        // Default environment for dependencies (v3: connect_to, v4: default_connection)
+        const defaultEnv = (0, config_loader_1.getProfileConnection)(profile) || options.api;
         for (const appName of selectedApps) {
             const appConfig = config.apps[appName];
             if (!appConfig) {
@@ -161,12 +163,13 @@ class ProfileResolver {
             const resolvedApp = await this.resolveApp(config, appName, appConfig, selectedApps, defaultEnv, options, processedDeps);
             resolvedApps.push(resolvedApp);
         }
-        // Collect infrastructure needs
+        // Collect infrastructure needs (v3: infrastructure, v4: provides)
+        const infrastructure = (0, config_loader_1.getInfrastructure)(config);
         for (const app of resolvedApps) {
             for (const [depName, depConfig] of Object.entries(app.dependencies)) {
                 if (processedDeps.has(depName))
                     continue;
-                const infraConfig = config.infrastructure?.[depName];
+                const infraConfig = infrastructure?.[depName];
                 if (infraConfig) {
                     resolvedInfra.push({
                         name: depName,
@@ -188,14 +191,19 @@ class ProfileResolver {
      */
     async resolveApp(config, appName, appConfig, selectedApps, defaultEnv, options, processedDeps) {
         const dependencies = {};
-        // Process each dependency
-        for (const [depName, requirement] of Object.entries(appConfig.requires || {})) {
-            if (requirement === 'none')
+        const infrastructure = (0, config_loader_1.getInfrastructure)(config);
+        // Process each dependency (v3: requires, v4: connects_to)
+        const appDeps = (0, config_loader_1.isV4)(config)
+            ? Object.entries(appConfig.connects_to || {})
+            : Object.entries(appConfig.requires || {});
+        for (const [depName, requirement] of appDeps) {
+            // v3 uses 'none', v4 uses { required: false }
+            if (requirement === 'none' || (typeof requirement === 'object' && !requirement.required))
                 continue;
             // Check if dependency is already in selected apps
             const isLocalApp = selectedApps.includes(depName);
             // Check if it's infrastructure
-            const isInfra = config.infrastructure?.[depName];
+            const isInfra = infrastructure?.[depName];
             if (isLocalApp) {
                 // Dependency is included locally
                 dependencies[depName] = { mode: 'local' };
@@ -210,12 +218,12 @@ class ProfileResolver {
                     url,
                 };
             }
-            else if (requirement === 'required' && !options.yes) {
+            else if ((requirement === 'required' || (typeof requirement === 'object' && requirement.required)) && !options.yes) {
                 // Prompt user for resolution
                 const resolution = await this.promptDependencyResolution(config, appName, depName, isInfra ? 'infrastructure' : 'app');
                 dependencies[depName] = resolution;
             }
-            else if (requirement === 'optional') {
+            else if (requirement === 'optional' || (typeof requirement === 'object' && !requirement.required)) {
                 // Skip optional dependencies if not explicitly included
                 continue;
             }
@@ -325,13 +333,18 @@ class ProfileResolver {
                 source: profile.database.source,
             };
         }
-        // If connect_to is set, use remote
-        if (profile.connect_to) {
-            const envConfig = config.environments?.[profile.connect_to];
+        // If connect_to (v3) or default_connection (v4) is set, use remote
+        const profileConnection = (0, config_loader_1.getProfileConnection)(profile);
+        if (profileConnection) {
+            const envConfig = config.environments?.[profileConnection];
+            // v4 uses urls.mongodb, v3 uses mongodb.url
+            const mongoUrl = (0, config_loader_1.isV4)(config)
+                ? envConfig?.urls?.mongodb
+                : envConfig?.mongodb?.url;
             return {
                 mode: 'remote',
-                source: profile.connect_to,
-                url: envConfig?.mongodb?.url,
+                source: profileConnection,
+                url: mongoUrl,
             };
         }
         // Interactive mode
@@ -385,10 +398,14 @@ class ProfileResolver {
         else if (answer.startsWith('remote-')) {
             const source = answer.replace('remote-', '');
             const envConfig = config.environments?.[source];
+            // v4 uses urls.mongodb, v3 uses mongodb.url
+            const mongoUrl = (0, config_loader_1.isV4)(config)
+                ? envConfig?.urls?.mongodb
+                : envConfig?.mongodb?.url;
             return {
                 mode: 'remote',
                 source,
-                url: envConfig?.mongodb?.url,
+                url: mongoUrl,
             };
         }
         return { mode: 'local' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genbox",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {