@objectql/cli 1.6.1 → 1.7.1

package/src/commands/studio.ts

@@ -42,7 +42,7 @@ function openBrowser(url: string) {
 }
 
 export async function startStudio(options: { port: number; dir: string, open?: boolean }) {
-    const port = options.port || 3000;
+    const startPort = options.port || 5555;
     const rootDir = path.resolve(process.cwd(), options.dir || '.');
     
     console.log(chalk.blue('Starting ObjectQL Studio...'));
@@ -78,6 +78,72 @@ export async function startStudio(options: { port: number; dir: string, open?: b
          process.exit(1);
     }
 
+    // Initialize App if it's a configuration object
+    if (typeof (app as any).init !== 'function') {
+        const config = app as any;
+        console.log(chalk.gray('Configuration object detected. Initializing ObjectQL instance...'));
+        
+        const datasources: any = {};
+        
+        if (config.datasource && config.datasource.default) {
+            const dbConfig = config.datasource.default;
+            if (dbConfig.type === 'sqlite') {
+                try {
+                    const { SqlDriver } = require('@objectql/driver-sql');
+                    datasources.default = new SqlDriver({
+                        client: 'sqlite3',
+                        connection: {
+                            filename: dbConfig.filename ? path.resolve(rootDir, dbConfig.filename) : ':memory:'
+                        },
+                        useNullAsDefault: true
+                    });
+                } catch (e) {
+                    console.warn(chalk.yellow('Failed to load @objectql/driver-sql. Ensure it is installed.'));
+                }
+            }
+        }
+
+        // Fallback to memory if no datasource
+        if (!datasources.default) {
+            console.warn(chalk.yellow('No valid datasource found. Using in-memory SQLite.'));
+            const { SqlDriver } = require('@objectql/driver-sql');
+            datasources.default = new SqlDriver({
+                client: 'sqlite3',
+                connection: { filename: ':memory:' },
+                useNullAsDefault: true
+            });
+        }
+
+        app = new ObjectQL({ datasources });
+        
+        // Load Schema
+        const loader = new ObjectLoader(app.metadata);
+
+        // Load Presets
+        if (Array.isArray(config.presets)) {
+            console.log(chalk.gray(`Loading ${config.presets.length} presets...`));
+            for (const preset of config.presets) {
+                try {
+                    loader.loadPackage(preset);
+                } catch (e: any) {
+                    console.warn(chalk.yellow(`Failed to load preset ${preset}:`), e.message);
+                }
+            }
+        }
+
+        // Load Schema from Directory
+        // In a monorepo root with presets, scanning everything is dangerous.
+        // We check if we are in a monorepo-like environment.
+        const isMonorepoRoot = fs.existsSync(path.join(rootDir, 'pnpm-workspace.yaml')) || fs.existsSync(path.join(rootDir, 'pnpm-lock.yaml'));
+        
+        // If we are in a likely monorepo root AND have presets, skip recursive scan
+        if (isMonorepoRoot && config.presets && config.presets.length > 0) {
+             console.log(chalk.yellow('Monorepo root detected with presets. Skipping recursive file scan of root directory to avoid conflicts.'));
+        } else {
+             loader.load(rootDir);
+        }
+    }
+
     // 2. Load Schema & Init
     try {
         await app.init();
@@ -254,13 +320,35 @@ export async function startStudio(options: { port: number; dir: string, open?: b
         res.end('Not Found');
     });
 
-    server.listen(port, () => {
-        const url = `http://localhost:${port}/studio`;
-        console.log(chalk.green(`\n🚀 Studio running at: ${chalk.bold(url)}`));
-        console.log(chalk.gray(`   API endpoint: http://localhost:${port}/api`));
-        
-        if (options.open) {
-            openBrowser(url);
-        }
-    });
+    const tryListen = (port: number) => {
+        server.removeAllListeners('error');
+        server.removeAllListeners('listening'); // Prevent stacking callbacks
+
+        server.on('error', (e: any) => {
+            if (e.code === 'EADDRINUSE') {
+                if (port - startPort < 10) {
+                    console.log(chalk.yellow(`Port ${port} is in use, trying ${port + 1}...`));
+                    server.close();
+                    tryListen(port + 1);
+                } else {
+                    console.error(chalk.red(`❌ Unable to find a free port.`));
+                    process.exit(1);
+                }
+            } else {
+                console.error(chalk.red('❌ Server error:'), e);
+            }
+        });
+
+        server.listen(port, () => {
+            const url = `http://localhost:${port}/studio`;
+            console.log(chalk.green(`\n🚀 Studio running at: ${chalk.bold(url)}`));
+            console.log(chalk.gray(`   API endpoint: http://localhost:${port}/api`));
+            
+            if (options.open) {
+                openBrowser(url);
+            }
+        });
+    };
+
+    tryListen(startPort);
 }

package/src/index.ts

@@ -3,14 +3,51 @@ import { generateTypes } from './commands/generate';
 import { startRepl } from './commands/repl';
 import { serve } from './commands/serve';
 import { startStudio } from './commands/studio';
+import { initProject } from './commands/init';
+import { newMetadata } from './commands/new';
+import { i18nExtract, i18nInit, i18nValidate } from './commands/i18n';
+import { migrate, migrateCreate, migrateStatus } from './commands/migrate';
 
 const program = new Command();
 
 program
   .name('objectql')
   .description('ObjectQL CLI tool')
-  .version('0.1.0');
+  .version('1.5.0');
 
+// Init command - Create new project
+program
+    .command('init')
+    .description('Create a new ObjectQL project from template')
+    .option('-t, --template <template>', 'Template to use (basic, express-api, enterprise)', 'basic')
+    .option('-n, --name <name>', 'Project name')
+    .option('-d, --dir <path>', 'Target directory')
+    .option('--skip-install', 'Skip dependency installation')
+    .option('--skip-git', 'Skip git initialization')
+    .action(async (options) => {
+        try {
+            await initProject(options);
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+// New command - Generate metadata files
+program
+    .command('new <type> <name>')
+    .description('Generate a new metadata file (object, view, form, etc.)')
+    .option('-d, --dir <path>', 'Output directory', '.')
+    .action(async (type, name, options) => {
+        try {
+            await newMetadata({ type, name, dir: options.dir });
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+// Generate command - Generate TypeScript types
 program
     .command('generate')
     .alias('g')
@@ -26,6 +63,96 @@ program
         }
     });
 
+// I18n commands
+const i18nCmd = program
+    .command('i18n')
+    .description('Internationalization commands');
+
+i18nCmd
+    .command('extract')
+    .description('Extract translatable strings from metadata files')
+    .option('-s, --source <path>', 'Source directory', '.')
+    .option('-o, --output <path>', 'Output directory', './src/i18n')
+    .option('-l, --lang <lang>', 'Language code', 'en')
+    .action(async (options) => {
+        try {
+            await i18nExtract(options);
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+i18nCmd
+    .command('init <lang>')
+    .description('Initialize i18n for a new language')
+    .option('-b, --base-dir <path>', 'Base i18n directory', './src/i18n')
+    .action(async (lang, options) => {
+        try {
+            await i18nInit({ lang, baseDir: options.baseDir });
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+i18nCmd
+    .command('validate <lang>')
+    .description('Validate translation completeness')
+    .option('-b, --base-dir <path>', 'Base i18n directory', './src/i18n')
+    .option('--base-lang <lang>', 'Base language to compare against', 'en')
+    .action(async (lang, options) => {
+        try {
+            await i18nValidate({ lang, baseDir: options.baseDir, baseLang: options.baseLang });
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+// Migration commands
+const migrateCmd = program
+    .command('migrate')
+    .description('Run pending database migrations')
+    .option('-c, --config <path>', 'Path to objectql.config.ts/js')
+    .option('-d, --dir <path>', 'Migrations directory', './migrations')
+    .action(async (options) => {
+        try {
+            await migrate(options);
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+migrateCmd
+    .command('create <name>')
+    .description('Create a new migration file')
+    .option('-d, --dir <path>', 'Migrations directory', './migrations')
+    .action(async (name, options) => {
+        try {
+            await migrateCreate({ name, dir: options.dir });
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+migrateCmd
+    .command('status')
+    .description('Show migration status')
+    .option('-c, --config <path>', 'Path to objectql.config.ts/js')
+    .option('-d, --dir <path>', 'Migrations directory', './migrations')
+    .action(async (options) => {
+        try {
+            await migrateStatus(options);
+        } catch (error) {
+            console.error(error);
+            process.exit(1);
+        }
+    });
+
+// REPL command
 program
     .command('repl')
     .alias('r')
@@ -35,6 +162,7 @@ program
         await startRepl(options.config);
     });
 
+// Serve command
 program
     .command('serve')
     .alias('s')
@@ -45,11 +173,12 @@ program
         await serve({ port: parseInt(options.port), dir: options.dir });
     });
 
+// Studio command
 program
     .command('studio')
     .alias('ui')
     .description('Start the ObjectQL Studio')
-    .option('-p, --port <number>', 'Port to listen on', '3000')
+    .option('-p, --port <number>', 'Port to listen on', '5555')
     .option('-d, --dir <path>', 'Directory containing schema', '.')
     .option('--no-open', 'Do not open browser automatically')
     .action(async (options) => {