spindb 0.4.1 → 0.5.2

package/engines/postgresql/index.ts

@@ -54,7 +54,12 @@ export class PostgreSQLEngine extends BaseEngine {
    */
   getBinaryPath(version: string): string {
     const { platform: p, arch: a } = this.getPlatformInfo()
-    return paths.getBinaryPath('postgresql', version, p, a)
+    return paths.getBinaryPath({
+      engine: 'postgresql',
+      version,
+      platform: p,
+      arch: a,
+    })
   }
 
   /**
@@ -104,7 +109,9 @@ export class PostgreSQLEngine extends BaseEngine {
   ): Promise<string> {
     const binPath = this.getBinaryPath(version)
     const initdbPath = join(binPath, 'bin', 'initdb')
-    const dataDir = paths.getContainerDataPath(containerName)
+    const dataDir = paths.getContainerDataPath(containerName, {
+      engine: this.name,
+    })
 
     await processManager.initdb(initdbPath, dataDir, {
       superuser: (options.superuser as string) || defaults.superuser,
@@ -123,8 +130,8 @@ export class PostgreSQLEngine extends BaseEngine {
     const { name, version, port } = container
     const binPath = this.getBinaryPath(version)
     const pgCtlPath = join(binPath, 'bin', 'pg_ctl')
-    const dataDir = paths.getContainerDataPath(name)
-    const logFile = paths.getContainerLogPath(name)
+    const dataDir = paths.getContainerDataPath(name, { engine: this.name })
+    const logFile = paths.getContainerLogPath(name, { engine: this.name })
 
     onProgress?.({ stage: 'starting', message: 'Starting PostgreSQL...' })
 
@@ -146,7 +153,7 @@ export class PostgreSQLEngine extends BaseEngine {
     const { name, version } = container
     const binPath = this.getBinaryPath(version)
     const pgCtlPath = join(binPath, 'bin', 'pg_ctl')
-    const dataDir = paths.getContainerDataPath(name)
+    const dataDir = paths.getContainerDataPath(name, { engine: this.name })
 
     await processManager.stop(pgCtlPath, dataDir)
   }
@@ -158,7 +165,7 @@ export class PostgreSQLEngine extends BaseEngine {
     const { name, version } = container
     const binPath = this.getBinaryPath(version)
     const pgCtlPath = join(binPath, 'bin', 'pg_ctl')
-    const dataDir = paths.getContainerDataPath(name)
+    const dataDir = paths.getContainerDataPath(name, { engine: this.name })
 
     return processManager.status(pgCtlPath, dataDir)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spindb",
-  "version": "0.4.1",
+  "version": "0.5.2",
   "description": "Spin up local database containers without Docker. A DBngin-like CLI for PostgreSQL.",
   "type": "module",
   "bin": {
@@ -9,7 +9,9 @@
   "scripts": {
     "start": "tsx cli/bin.ts",
     "dev": "tsx watch cli/bin.ts",
-    "test": "tsx --test",
+    "test": "pnpm test:pg && pnpm test:mysql",
+    "test:pg": "node --import tsx --test tests/integration/postgresql.test.ts",
+    "test:mysql": "node --import tsx --test tests/integration/mysql.test.ts",
     "format": "prettier --write .",
     "lint": "tsc --noEmit && eslint ."
   },

package/types/index.ts

@@ -1,6 +1,6 @@
 export type ContainerConfig = {
   name: string
-  engine: string
+  engine: EngineName
   version: string
   port: number
   database: string
@@ -9,6 +9,12 @@ export type ContainerConfig = {
   clonedFrom?: string
 }
 
+/**
+ * Supported database engine names
+ * Extendable for future engines (sqlite, etc.)
+ */
+export type EngineName = 'postgresql' | 'mysql'
+
 export type ProgressCallback = (progress: {
   stage: string
   message: string
@@ -65,9 +71,20 @@ export type EngineInfo = {
 }
 
 /**
- * Binary tool types
+ * Binary tool types for all supported engines
  */
-export type BinaryTool = 'psql' | 'pg_dump' | 'pg_restore' | 'pg_basebackup'
+export type BinaryTool =
+  // PostgreSQL tools
+  | 'psql'
+  | 'pg_dump'
+  | 'pg_restore'
+  | 'pg_basebackup'
+  // MySQL tools
+  | 'mysql'
+  | 'mysqldump'
+  | 'mysqlpump'
+  | 'mysqld'
+  | 'mysqladmin'
 
 /**
  * Source of a binary - bundled (downloaded by spindb) or system (found on PATH)
@@ -88,16 +105,23 @@ export type BinaryConfig = {
  * Global spindb configuration stored in ~/.spindb/config.json
  */
 export type SpinDBConfig = {
-  // Binary paths for client tools
+  // Binary paths for client tools (all engines)
   binaries: {
+    // PostgreSQL tools
     psql?: BinaryConfig
     pg_dump?: BinaryConfig
     pg_restore?: BinaryConfig
     pg_basebackup?: BinaryConfig
+    // MySQL tools
+    mysql?: BinaryConfig
+    mysqldump?: BinaryConfig
+    mysqlpump?: BinaryConfig
+    mysqld?: BinaryConfig
+    mysqladmin?: BinaryConfig
   }
   // Default settings
   defaults?: {
-    engine?: string
+    engine?: EngineName
     version?: string
     port?: number
   }