herdux-cli 0.3.1 → 0.4.0

package/dist/infra/engines/resolve-connection.js

@@ -0,0 +1,156 @@
+import ora from "ora";
+import chalk from "chalk";
+import prompts from "prompts";
+import { createEngine } from "./engine-factory.js";
+import * as config from "../config/config.service.js";
+import { logger } from "../../presentation/logger.js";
+// --- Main Resolver ---
+/**
+ * Resolves both the database engine and connection options together.
+ *
+ * Engine priority:
+ *   1. `--engine` CLI flag
+ *   2. `engine` field from the selected server profile
+ *   3. `engine` field from config defaults (`herdux config set engine mysql`)
+ *   4. `"postgres"` fallback
+ *
+ * Connection priority:
+ *   1. Explicit CLI flags (--host, --port, --user, --password)
+ *   2. Server profile values
+ *   3. Config default values
+ *   4. Engine-specific defaults (e.g., port 5432 for PG, 3306 for MySQL)
+ */
+export async function resolveEngineAndConnection(rawOpts) {
+    const savedDefaults = config.getDefault();
+    let serverName = rawOpts.server;
+    let profileEngine;
+    // --- Step 1: Resolve server profile (may provide engine) ---
+    if (!serverName && !rawOpts.port && !rawOpts.host && process.stdout.isTTY) {
+        const servers = config.listServers();
+        const serverNames = Object.keys(servers);
+        if (serverNames.length > 0) {
+            const choices = serverNames.map((name) => {
+                const srv = servers[name];
+                const engineLabel = srv.engine ? `, engine: ${srv.engine}` : "";
+                return {
+                    title: `${name} (port ${srv.port ?? "?"}${engineLabel})`,
+                    value: name,
+                };
+            });
+            if (Object.keys(savedDefaults).length > 0) {
+                const defaultEngineLabel = savedDefaults.engine
+                    ? `, engine: ${savedDefaults.engine}`
+                    : "";
+                choices.unshift({
+                    title: `Default connection (port ${savedDefaults.port ?? "?"}${defaultEngineLabel})`,
+                    value: "__default__",
+                });
+            }
+            const response = await prompts({
+                type: "select",
+                name: "server",
+                message: "Select a connection to use:",
+                choices,
+            });
+            if (!response.server) {
+                console.log(chalk.yellow("\n⚠ Operation cancelled.\n"));
+                process.exit(0);
+            }
+            if (response.server !== "__default__") {
+                serverName = response.server;
+            }
+        }
+    }
+    // --- Step 2: Determine engine type ---
+    // Priority: CLI flag > profile engine > config default engine > "postgres"
+    let engineType;
+    if (rawOpts.engine) {
+        engineType = rawOpts.engine;
+    }
+    else if (serverName) {
+        const profile = config.getServer(serverName);
+        profileEngine = profile?.engine;
+        engineType = profileEngine ?? savedDefaults.engine ?? "postgres";
+    }
+    else {
+        engineType = savedDefaults.engine ?? "postgres";
+    }
+    const engine = createEngine(engineType);
+    // --- Step 3: Resolve connection options ---
+    if (serverName) {
+        const serverProfile = config.getServer(serverName);
+        if (!serverProfile) {
+            logger.error(`Server profile "${serverName}" not found.`);
+            logger.info("Available profiles:");
+            const servers = config.listServers();
+            const names = Object.keys(servers);
+            if (names.length === 0) {
+                logger.line("(none)");
+                logger.line("Add one with: herdux config add-server <name> --port <port> --password <pw>");
+            }
+            else {
+                for (const name of names) {
+                    logger.line(`  ${chalk.green(name)}: port=${servers[name].port ?? "?"}`);
+                }
+            }
+            process.exit(1);
+        }
+        const defaults = engine.getDefaultConnectionOptions();
+        return {
+            engine,
+            engineType,
+            opts: {
+                host: rawOpts.host ?? serverProfile.host ?? defaults.host,
+                port: rawOpts.port ?? serverProfile.port,
+                user: rawOpts.user ?? serverProfile.user ?? defaults.user,
+                password: rawOpts.password ?? serverProfile.password,
+            },
+        };
+    }
+    // No server profile — merge CLI opts with config defaults
+    const merged = {
+        host: rawOpts.host ?? savedDefaults.host,
+        port: rawOpts.port ?? savedDefaults.port,
+        user: rawOpts.user ?? savedDefaults.user,
+        password: rawOpts.password ?? savedDefaults.password,
+    };
+    if (merged.port) {
+        return { engine, engineType, opts: merged };
+    }
+    // --- Step 4: Auto-discovery ---
+    const spinner = ora(`Scanning for running ${engine.getEngineName()} servers...`).start();
+    const instances = await engine.discoverInstances(merged);
+    if (instances.length === 0) {
+        spinner.fail(`No running ${engine.getEngineName()} servers found`);
+        logger.blank();
+        logger.error(`Could not find any ${engine.getEngineName()} server on common ports.`);
+        logger.info("Options:");
+        logger.line("1. Specify port: herdux --port 5417 list");
+        logger.line("2. Save defaults: herdux config set port 5417");
+        logger.line("3. Add server:    herdux config add-server pg17 --port 5417");
+        logger.blank();
+        process.exit(1);
+    }
+    if (instances.length === 1) {
+        const instance = instances[0];
+        spinner.succeed(`Auto-detected server on port ${chalk.cyan(instance.port)} (${instance.version})`);
+        return { engine, engineType, opts: { ...merged, port: instance.port } };
+    }
+    spinner.succeed(`Found ${instances.length} running servers`);
+    const choices = instances.map((inst) => ({
+        title: `Port ${inst.port} — ${inst.version}`,
+        value: inst.port,
+    }));
+    const response = await prompts({
+        type: "select",
+        name: "port",
+        message: `Multiple ${engine.getEngineName()} servers found. Which one do you want to use?`,
+        choices,
+    });
+    if (!response.port) {
+        console.log(chalk.yellow("\n⚠ Operation cancelled.\n"));
+        process.exit(0);
+    }
+    return { engine, engineType, opts: { ...merged, port: response.port } };
+}
+//# sourceMappingURL=resolve-connection.js.map

package/dist/infra/engines/resolve-connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-connection.js","sourceRoot":"","sources":["../../../src/infra/engines/resolve-connection.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdux-cli",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Modern Database workflow CLI focused on developer experience, safety, and automation.",
   "repository": {
     "type": "git",
@@ -27,8 +27,13 @@
     "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch --selectProjects unit",
     "test:unit": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --selectProjects unit",
     "test:e2e": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --selectProjects e2e",
-    "test:e2e:up": "docker compose -f infra/docker/compose.e2e.yml up -d --wait",
-    "test:e2e:down": "docker compose -f infra/docker/compose.e2e.yml down -v --remove-orphans"
+    "test:e2e:pgsql": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js -- tests/e2e/postgres/",
+    "test:e2e:pgsql:up": "docker compose -f infra/docker/compose.e2e-pgsql.yml up -d --wait",
+    "test:e2e:pgsql:down": "docker compose -f infra/docker/compose.e2e-pgsql.yml down -v --remove-orphans",
+    "test:e2e:mysql": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js -- tests/e2e/mysql/",
+    "test:e2e:mysql:up": "docker compose -f infra/docker/compose.e2e-mysql.yml up -d --wait",
+    "test:e2e:mysql:down": "docker compose -f infra/docker/compose.e2e-mysql.yml down -v --remove-orphans",
+    "prepare": "husky"
   },
   "keywords": [
     "postgresql",
@@ -51,7 +56,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^5.6.2",
-    "commander": "^13.1.0",
+    "commander": "^14.0.3",
     "execa": "^9.6.1",
     "ora": "^8.2.0",
     "prompts": "^2.4.2"
@@ -60,10 +65,15 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^25.3.0",
     "@types/prompts": "^2.4.9",
+    "husky": "^9.1.7",
     "jest": "^30.2.0",
+    "lint-staged": "^16.2.7",
     "prettier": "^3.8.1",
     "ts-jest": "^29.4.6",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
+  },
+  "lint-staged": {
+    "*.{ts,md,json}": "prettier --write"
   }
 }