spindb 0.7.3 → 0.8.0

package/cli/commands/menu/engine-handlers.ts

@@ -40,7 +40,6 @@ export async function handleEngines(): Promise<void> {
     return
   }
 
-  // Separate PostgreSQL and MySQL
   const pgEngines = engines.filter(
     (e): e is InstalledPostgresEngine => e.engine === 'postgresql',
   )
@@ -48,10 +47,8 @@ export async function handleEngines(): Promise<void> {
     (e): e is InstalledMysqlEngine => e.engine === 'mysql',
   )
 
-  // Calculate total size for PostgreSQL
   const totalPgSize = pgEngines.reduce((acc, e) => acc + e.sizeBytes, 0)
 
-  // Table header
   console.log()
   console.log(
     chalk.gray('  ') +
@@ -62,7 +59,6 @@ export async function handleEngines(): Promise<void> {
   )
   console.log(chalk.gray('  ' + '─'.repeat(55)))
 
-  // PostgreSQL rows
   for (const engine of pgEngines) {
     const icon = getEngineIcon(engine.engine)
     const platformInfo = `${engine.platform}-${engine.arch}`
@@ -76,7 +72,6 @@ export async function handleEngines(): Promise<void> {
     )
   }
 
-  // MySQL row
   if (mysqlEngine) {
     const icon = ENGINE_ICONS.mysql
     const displayName = mysqlEngine.isMariaDB ? 'mariadb' : 'mysql'
@@ -92,7 +87,6 @@ export async function handleEngines(): Promise<void> {
 
   console.log(chalk.gray('  ' + '─'.repeat(55)))
 
-  // Summary
   console.log()
   if (pgEngines.length > 0) {
     console.log(
@@ -106,7 +100,6 @@ export async function handleEngines(): Promise<void> {
   }
   console.log()
 
-  // Menu options - only allow deletion of PostgreSQL engines
   const choices: MenuChoice[] = []
 
   for (const e of pgEngines) {
@@ -116,7 +109,6 @@ export async function handleEngines(): Promise<void> {
     })
   }
 
-  // MySQL info option (not disabled, shows info icon)
   if (mysqlEngine) {
     const displayName = mysqlEngine.isMariaDB ? 'MariaDB' : 'MySQL'
     choices.push({
@@ -145,14 +137,12 @@ export async function handleEngines(): Promise<void> {
   if (action.startsWith('delete:')) {
     const [, enginePath, engineName, engineVersion] = action.split(':')
     await handleDeleteEngine(enginePath, engineName, engineVersion)
-    // Return to engines menu
     await handleEngines()
   }
 
   if (action.startsWith('mysql-info:')) {
     const mysqldPath = action.replace('mysql-info:', '')
     await handleMysqlInfo(mysqldPath)
-    // Return to engines menu
     await handleEngines()
   }
 }
@@ -162,7 +152,6 @@ async function handleDeleteEngine(
   engineName: string,
   engineVersion: string,
 ): Promise<void> {
-  // Check if any container is using this engine version
   const containers = await containerManager.list()
   const usingContainers = containers.filter(
     (c) => c.engine === engineName && c.version === engineVersion,
@@ -216,21 +205,17 @@ async function handleDeleteEngine(
 async function handleMysqlInfo(mysqldPath: string): Promise<void> {
   console.clear()
 
-  // Get install info
   const installInfo = await getMysqlInstallInfo(mysqldPath)
   const displayName = installInfo.isMariaDB ? 'MariaDB' : 'MySQL'
 
-  // Get version
   const version = await getMysqlVersion(mysqldPath)
 
   console.log(header(`${displayName} Information`))
   console.log()
 
-  // Check for containers using MySQL
   const containers = await containerManager.list()
   const mysqlContainers = containers.filter((c) => c.engine === 'mysql')
 
-  // Track running containers for uninstall instructions
   const runningContainers: string[] = []
 
   if (mysqlContainers.length > 0) {
@@ -261,7 +246,6 @@ async function handleMysqlInfo(mysqldPath: string): Promise<void> {
     console.log()
   }
 
-  // Show installation details
   console.log(chalk.white('  Installation Details:'))
   console.log(chalk.gray('  ' + '─'.repeat(50)))
   console.log(
@@ -286,13 +270,11 @@ async function handleMysqlInfo(mysqldPath: string): Promise<void> {
   )
   console.log()
 
-  // Uninstall instructions
   console.log(chalk.white('  To uninstall:'))
   console.log(chalk.gray('  ' + '─'.repeat(50)))
 
   let stepNum = 1
 
-  // Step: Stop running containers first
   if (runningContainers.length > 0) {
     console.log(chalk.gray(`  # ${stepNum}. Stop running SpinDB containers`))
     console.log(chalk.cyan('  spindb stop <container-name>'))
@@ -300,7 +282,6 @@ async function handleMysqlInfo(mysqldPath: string): Promise<void> {
     stepNum++
   }
 
-  // Step: Delete SpinDB containers
   if (mysqlContainers.length > 0) {
     console.log(chalk.gray(`  # ${stepNum}. Delete SpinDB containers`))
     console.log(chalk.cyan('  spindb delete <container-name>'))
@@ -371,7 +352,6 @@ async function handleMysqlInfo(mysqldPath: string): Promise<void> {
 
   console.log()
 
-  // Wait for user
   await inquirer.prompt([
     {
       type: 'input',

package/cli/commands/menu/index.ts

@@ -5,20 +5,16 @@ import { containerManager } from '../../../core/container-manager'
 import { promptInstallDependencies } from '../../ui/prompts'
 import { header, error } from '../../ui/theme'
 import { getInstalledEngines } from '../../helpers'
-import { type MenuChoice } from './shared'
 import {
   handleCreate,
   handleList,
   handleStart,
   handleStop,
 } from './container-handlers'
-import {
-  handleBackup,
-  handleRestore,
-  handleClone,
-} from './backup-handlers'
+import { handleBackup, handleRestore, handleClone } from './backup-handlers'
 import { handleEngines } from './engine-handlers'
 import { handleCheckUpdate } from './update-handlers'
+import { type MenuChoice } from './shared'
 
 async function showMainMenu(): Promise<void> {
   console.clear()
@@ -148,7 +144,6 @@ async function showMainMenu(): Promise<void> {
       process.exit(0)
   }
 
-  // Return to menu after action
   await showMainMenu()
 }
 

package/cli/commands/menu/shell-handlers.ts

@@ -32,7 +32,6 @@ export async function handleCopyConnectionString(
   const engine = getEngine(config.engine)
   const connectionString = engine.getConnectionString(config)
 
-  // Copy to clipboard using platform service
   const copied = await platformService.copyToClipboard(connectionString)
 
   console.log()
@@ -64,7 +63,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
   const engine = getEngine(config.engine)
   const connectionString = engine.getConnectionString(config)
 
-  // Check which enhanced shells are installed (with loading indicator)
   const shellCheckSpinner = createSpinner('Checking available shells...')
   shellCheckSpinner.start()
 
@@ -100,7 +98,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
     },
   ]
 
-  // Engine-specific enhanced CLI (pgcli for PostgreSQL, mycli for MySQL)
   if (engineSpecificInstalled) {
     choices.push({
       name: `⚡ Use ${engineSpecificCli} (enhanced features, recommended)`,
@@ -113,7 +110,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
     })
   }
 
-  // usql - universal option
   if (usqlInstalled) {
     choices.push({
       name: '⚡ Use usql (universal SQL client)',
@@ -146,7 +142,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
     return
   }
 
-  // Handle pgcli installation
   if (shellChoice === 'install-pgcli') {
     console.log()
     console.log(info('Installing pgcli for enhanced PostgreSQL shell...'))
@@ -180,7 +175,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
     return
   }
 
-  // Handle mycli installation
   if (shellChoice === 'install-mycli') {
     console.log()
     console.log(info('Installing mycli for enhanced MySQL shell...'))
@@ -214,7 +208,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
     return
   }
 
-  // Handle usql installation
   if (shellChoice === 'install-usql') {
     console.log()
     console.log(info('Installing usql for enhanced shell experience...'))
@@ -248,7 +241,6 @@ export async function handleOpenShell(containerName: string): Promise<void> {
     return
   }
 
-  // Launch the selected shell
   await launchShell(containerName, config, connectionString, shellChoice)
 }
 
@@ -261,7 +253,6 @@ async function launchShell(
   console.log(info(`Connecting to ${containerName}...`))
   console.log()
 
-  // Determine shell command based on engine and shell type
   let shellCmd: string
   let shellArgs: string[]
   let installHint: string
@@ -291,7 +282,6 @@ async function launchShell(
     installHint = 'brew tap xo/xo && brew install xo/xo/usql'
   } else if (config.engine === 'mysql') {
     shellCmd = 'mysql'
-    // MySQL connection: mysql -u root -h 127.0.0.1 -P port database
     shellArgs = [
       '-u',
       'root',
@@ -303,7 +293,6 @@ async function launchShell(
     ]
     installHint = 'brew install mysql-client'
   } else {
-    // PostgreSQL (default)
     shellCmd = 'psql'
     shellArgs = [connectionString]
     installHint = 'brew install libpq && brew link --force libpq'

package/cli/commands/menu/sql-handlers.ts

@@ -20,7 +20,6 @@ export async function handleRunSql(containerName: string): Promise<void> {
 
   const engine = getEngine(config.engine)
 
-  // Check for required client tools
   let missingDeps = await getMissingDependencies(config.engine)
   if (missingDeps.length > 0) {
     console.log(
@@ -72,14 +71,12 @@ export async function handleRunSql(containerName: string): Promise<void> {
     },
   ])
 
-  // Empty input = go back to submenu
   if (!rawFilePath.trim()) {
     return
   }
 
   const filePath = stripQuotes(rawFilePath)
 
-  // Select database if container has multiple
   const databases = config.databases || [config.database]
   let databaseName: string
 

package/cli/commands/restore.ts

@@ -41,7 +41,6 @@ export const restoreCommand = new Command('restore')
         let containerName = name
         let backupPath = backup
 
-        // Interactive selection if no name provided
         if (!containerName) {
           const containers = await containerManager.list()
           const running = containers.filter((c) => c.status === 'running')
@@ -69,7 +68,6 @@ export const restoreCommand = new Command('restore')
           containerName = selected
         }
 
-        // Get container config
         const config = await containerManager.getConfig(containerName)
         if (!config) {
           console.error(error(`Container "${containerName}" not found`))
@@ -78,7 +76,6 @@ export const restoreCommand = new Command('restore')
 
         const { engine: engineName } = config
 
-        // Check if running
         const running = await processManager.isRunning(containerName, {
           engine: engineName,
         })
@@ -91,10 +88,8 @@ export const restoreCommand = new Command('restore')
           process.exit(1)
         }
 
-        // Get engine
         const engine = getEngine(engineName)
 
-        // Check for required client tools BEFORE doing anything
         const depsSpinner = createSpinner('Checking required tools...')
         depsSpinner.start()
 
@@ -104,7 +99,6 @@ export const restoreCommand = new Command('restore')
             `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
           )
 
-          // Offer to install
           const installed = await promptInstallDependencies(
             missingDeps[0].binary,
             config.engine,
@@ -114,7 +108,6 @@ export const restoreCommand = new Command('restore')
             process.exit(1)
           }
 
-          // Verify installation worked
           missingDeps = await getMissingDependencies(config.engine)
           if (missingDeps.length > 0) {
             console.error(
@@ -131,9 +124,7 @@ export const restoreCommand = new Command('restore')
           depsSpinner.succeed('Required tools available')
         }
 
-        // Handle --from-url option
         if (options.fromUrl) {
-          // Validate connection string matches container's engine
           const isPgUrl =
             options.fromUrl.startsWith('postgresql://') ||
             options.fromUrl.startsWith('postgres://')
@@ -166,13 +157,12 @@ export const restoreCommand = new Command('restore')
             process.exit(1)
           }
 
-          // Create temp file for the dump
           const timestamp = Date.now()
           tempDumpPath = join(tmpdir(), `spindb-dump-${timestamp}.dump`)
 
           let dumpSuccess = false
           let attempts = 0
-          const maxAttempts = 2 // Allow one retry after installing deps
+          const maxAttempts = 2
 
           while (!dumpSuccess && attempts < maxAttempts) {
             attempts++
@@ -193,7 +183,6 @@ export const restoreCommand = new Command('restore')
               const e = err as Error
               dumpSpinner.fail('Failed to create dump')
 
-              // Check if this is a missing tool error
               const dumpTool = engineName === 'mysql' ? 'mysqldump' : 'pg_dump'
               if (
                 e.message.includes(`${dumpTool} not found`) ||
@@ -206,7 +195,6 @@ export const restoreCommand = new Command('restore')
                 if (!installed) {
                   process.exit(1)
                 }
-                // Loop will retry
                 continue
               }
 
@@ -217,13 +205,11 @@ export const restoreCommand = new Command('restore')
             }
           }
 
-          // Safety check - should never reach here without backupPath set
           if (!dumpSuccess) {
             console.error(error('Failed to create dump after retries'))
             process.exit(1)
           }
         } else {
-          // Check backup file
           if (!backupPath) {
             console.error(error('Backup file path is required'))
             console.log(
@@ -243,26 +229,22 @@ export const restoreCommand = new Command('restore')
           }
         }
 
-        // Get database name
         let databaseName = options.database
         if (!databaseName) {
           databaseName = await promptDatabaseName(containerName, engineName)
         }
 
-        // At this point backupPath is guaranteed to be set
         if (!backupPath) {
           console.error(error('No backup path specified'))
           process.exit(1)
         }
 
-        // Detect backup format
         const detectSpinner = createSpinner('Detecting backup format...')
         detectSpinner.start()
 
         const format = await engine.detectBackupFormat(backupPath)
         detectSpinner.succeed(`Detected: ${format.description}`)
 
-        // Create database
         const dbSpinner = createSpinner(
           `Creating database "${databaseName}"...`,
         )
@@ -271,16 +253,14 @@ export const restoreCommand = new Command('restore')
         await engine.createDatabase(config, databaseName)
         dbSpinner.succeed(`Database "${databaseName}" ready`)
 
-        // Add database to container's databases array
         await containerManager.addDatabase(containerName, databaseName)
 
-        // Restore backup
         const restoreSpinner = createSpinner('Restoring backup...')
         restoreSpinner.start()
 
         const result = await engine.restore(config, backupPath, {
           database: databaseName,
-          createDatabase: false, // Already created
+          createDatabase: false,
         })
 
         if (result.code === 0 || !result.stderr) {
@@ -302,7 +282,6 @@ export const restoreCommand = new Command('restore')
           }
         }
 
-        // Show connection info
         const connectionString = engine.getConnectionString(
           config,
           databaseName,
@@ -313,7 +292,6 @@ export const restoreCommand = new Command('restore')
         console.log(chalk.gray('  Connection string:'))
         console.log(chalk.cyan(`  ${connectionString}`))
 
-        // Copy connection string to clipboard using platform service
         const copied = await platformService.copyToClipboard(connectionString)
         if (copied) {
           console.log(chalk.gray('  Connection string copied to clipboard'))
@@ -330,13 +308,10 @@ export const restoreCommand = new Command('restore')
       } catch (err) {
         const e = err as Error
 
-        // Check if this is a missing tool error (PostgreSQL or MySQL)
         const missingToolPatterns = [
-          // PostgreSQL
           'pg_restore not found',
           'psql not found',
           'pg_dump not found',
-          // MySQL
           'mysql not found',
           'mysqldump not found',
         ]
@@ -359,7 +334,6 @@ export const restoreCommand = new Command('restore')
         console.error(error(e.message))
         process.exit(1)
       } finally {
-        // Clean up temp file if we created one
         if (tempDumpPath) {
           try {
             await rm(tempDumpPath, { force: true })

package/cli/commands/run.ts

@@ -23,7 +23,6 @@ export const runCommand = new Command('run')
       try {
         const containerName = name
 
-        // Get container config
         const config = await containerManager.getConfig(containerName)
         if (!config) {
           console.error(error(`Container "${containerName}" not found`))
@@ -32,7 +31,6 @@ export const runCommand = new Command('run')
 
         const { engine: engineName } = config
 
-        // Check if running
         const running = await processManager.isRunning(containerName, {
           engine: engineName,
         })
@@ -45,7 +43,6 @@ export const runCommand = new Command('run')
           process.exit(1)
         }
 
-        // Validate: must have either file or --sql, not both
         if (file && options.sql) {
           console.error(
             error('Cannot specify both a file and --sql option. Choose one.'),
@@ -64,16 +61,13 @@ export const runCommand = new Command('run')
           process.exit(1)
         }
 
-        // Validate file exists
         if (file && !existsSync(file)) {
           console.error(error(`SQL file not found: ${file}`))
           process.exit(1)
         }
 
-        // Get engine
         const engine = getEngine(engineName)
 
-        // Check for required client tools
         let missingDeps = await getMissingDependencies(engineName)
         if (missingDeps.length > 0) {
           console.log(
@@ -82,7 +76,6 @@ export const runCommand = new Command('run')
             ),
           )
 
-          // Offer to install
           const installed = await promptInstallDependencies(
             missingDeps[0].binary,
             engineName,
@@ -92,7 +85,6 @@ export const runCommand = new Command('run')
             process.exit(1)
           }
 
-          // Verify installation worked
           missingDeps = await getMissingDependencies(engineName)
           if (missingDeps.length > 0) {
             console.error(
@@ -107,10 +99,8 @@ export const runCommand = new Command('run')
           console.log()
         }
 
-        // Determine target database
         const database = options.database || config.database
 
-        // Run the SQL
         await engine.runScript(config, {
           file,
           sql: options.sql,
@@ -119,7 +109,6 @@ export const runCommand = new Command('run')
       } catch (err) {
         const e = err as Error
 
-        // Check if this is a missing tool error
         const missingToolPatterns = [
           'psql not found',
           'mysql not found',

package/cli/commands/start.ts

@@ -16,7 +16,6 @@ export const startCommand = new Command('start')
     try {
       let containerName = name
 
-      // Interactive selection if no name provided
       if (!containerName) {
         const containers = await containerManager.list()
         const stopped = containers.filter((c) => c.status !== 'running')
@@ -40,7 +39,6 @@ export const startCommand = new Command('start')
         containerName = selected
       }
 
-      // Get container config
       const config = await containerManager.getConfig(containerName)
       if (!config) {
         console.error(error(`Container "${containerName}" not found`))
@@ -49,7 +47,6 @@ export const startCommand = new Command('start')
 
       const { engine: engineName } = config
 
-      // Check if already running
       const running = await processManager.isRunning(containerName, {
         engine: engineName,
       })
@@ -58,10 +55,7 @@ export const startCommand = new Command('start')
         return
       }
 
-      // Get engine defaults for port range and database name
       const engineDefaults = getEngineDefaults(engineName)
-
-      // Get engine and start with retry (handles port race conditions)
       const engine = getEngine(engineName)
 
       const spinner = createSpinner(`Starting ${containerName}...`)
@@ -93,8 +87,8 @@ export const startCommand = new Command('start')
         spinner.succeed(`Container "${containerName}" started`)
       }
 
-      // Ensure the user's database exists (if different from default)
-      const defaultDb = engineDefaults.superuser // postgres or root
+      // Database might already exist, which is fine
+      const defaultDb = engineDefaults.superuser
       if (config.database && config.database !== defaultDb) {
         const dbSpinner = createSpinner(
           `Ensuring database "${config.database}" exists...`,
@@ -104,12 +98,10 @@ export const startCommand = new Command('start')
           await engine.createDatabase(config, config.database)
           dbSpinner.succeed(`Database "${config.database}" ready`)
         } catch {
-          // Database might already exist, which is fine
           dbSpinner.succeed(`Database "${config.database}" ready`)
         }
       }
 
-      // Show connection info
       const connectionString = engine.getConnectionString(config)
       console.log()
       console.log(chalk.gray('  Connection string:'))

package/cli/commands/stop.ts

@@ -13,7 +13,6 @@ export const stopCommand = new Command('stop')
   .action(async (name: string | undefined, options: { all?: boolean }) => {
     try {
       if (options.all) {
-        // Stop all running containers
         const containers = await containerManager.list()
         const running = containers.filter((c) => c.status === 'running')
 
@@ -41,7 +40,6 @@ export const stopCommand = new Command('stop')
 
       let containerName = name
 
-      // Interactive selection if no name provided
       if (!containerName) {
         const containers = await containerManager.list()
         const running = containers.filter((c) => c.status === 'running')
@@ -59,14 +57,12 @@ export const stopCommand = new Command('stop')
         containerName = selected
       }
 
-      // Get container config
       const config = await containerManager.getConfig(containerName)
       if (!config) {
         console.error(error(`Container "${containerName}" not found`))
         process.exit(1)
       }
 
-      // Check if running
       const running = await processManager.isRunning(containerName, {
         engine: config.engine,
       })
@@ -75,7 +71,6 @@ export const stopCommand = new Command('stop')
         return
       }
 
-      // Get engine and stop
       const engine = getEngine(config.engine)
 
       const spinner = createSpinner(`Stopping ${containerName}...`)

package/cli/commands/url.ts

@@ -20,7 +20,6 @@ export const urlCommand = new Command('url')
       try {
         let containerName = name
 
-        // Interactive selection if no name provided
         if (!containerName) {
           const containers = await containerManager.list()
 
@@ -37,19 +36,16 @@ export const urlCommand = new Command('url')
           containerName = selected
         }
 
-        // Get container config
         const config = await containerManager.getConfig(containerName)
         if (!config) {
           console.error(error(`Container "${containerName}" not found`))
           process.exit(1)
         }
 
-        // Get connection string
         const engine = getEngine(config.engine)
         const databaseName = options.database || config.database
         const connectionString = engine.getConnectionString(config, databaseName)
 
-        // JSON output
         if (options.json) {
           const jsonOutput = {
             connectionString,
@@ -64,22 +60,17 @@ export const urlCommand = new Command('url')
           return
         }
 
-        // Copy to clipboard if requested
         if (options.copy) {
           const copied = await platformService.copyToClipboard(connectionString)
           if (copied) {
-            // Output the string AND confirmation
             console.log(connectionString)
             console.error(success('Copied to clipboard'))
           } else {
-            // Output the string but warn about clipboard
             console.log(connectionString)
             console.error(warning('Could not copy to clipboard'))
           }
         } else {
-          // Just output the connection string (no newline formatting for easy piping)
           process.stdout.write(connectionString)
-          // Add newline if stdout is a TTY (interactive terminal)
           if (process.stdout.isTTY) {
             console.log()
           }