relq 1.0.1 → 1.0.3

package/dist/cjs/cli/utils/git-utils.cjs

@@ -33,12 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.colors = void 0;
-exports.error = error;
-exports.fatal = fatal;
-exports.warning = warning;
-exports.hint = hint;
-exports.success = success;
+exports.requireInit = exports.progressBar = exports.formatDuration = exports.formatBytes = exports.select = exports.confirm = exports.success = exports.hint = exports.warning = exports.error = exports.fatal = exports.createSpinner = exports.colors = void 0;
 exports.info = info;
 exports.getWorkingTreeStatus = getWorkingTreeStatus;
 exports.requireRepository = requireRepository;
@@ -50,43 +45,24 @@ exports.checkUncommittedChanges = checkUncommittedChanges;
 exports.printMergeStrategyHelp = printMergeStrategyHelp;
 exports.validatePostgresSQL = validatePostgresSQL;
 exports.readSQLFile = readSQLFile;
-exports.createSpinner = createSpinner;
-exports.confirm = confirm;
-exports.select = select;
-exports.formatBytes = formatBytes;
-exports.formatDuration = formatDuration;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const repo_manager_1 = require("./repo-manager.cjs");
-const isColorSupported = process.stdout.isTTY && !process.env.NO_COLOR;
-exports.colors = {
-    red: (s) => isColorSupported ? `\x1b[31m${s}\x1b[0m` : s,
-    green: (s) => isColorSupported ? `\x1b[32m${s}\x1b[0m` : s,
-    yellow: (s) => isColorSupported ? `\x1b[33m${s}\x1b[0m` : s,
-    blue: (s) => isColorSupported ? `\x1b[34m${s}\x1b[0m` : s,
-    magenta: (s) => isColorSupported ? `\x1b[35m${s}\x1b[0m` : s,
-    cyan: (s) => isColorSupported ? `\x1b[36m${s}\x1b[0m` : s,
-    white: (s) => isColorSupported ? `\x1b[37m${s}\x1b[0m` : s,
-    gray: (s) => isColorSupported ? `\x1b[90m${s}\x1b[0m` : s,
-    bold: (s) => isColorSupported ? `\x1b[1m${s}\x1b[0m` : s,
-    dim: (s) => isColorSupported ? `\x1b[2m${s}\x1b[0m` : s,
-};
-function error(message) {
-    console.error(`${exports.colors.red('error:')} ${message}`);
-}
-function fatal(message) {
-    console.error(`${exports.colors.red('fatal:')} ${message}`);
-    process.exit(128);
-}
-function warning(message) {
-    console.error(`${exports.colors.yellow('warning:')} ${message}`);
-}
-function hint(message) {
-    console.log(`${exports.colors.yellow('hint:')} ${message}`);
-}
-function success(message) {
-    console.log(`${exports.colors.green('✓')} ${message}`);
-}
+var cli_utils_1 = require("./cli-utils.cjs");
+Object.defineProperty(exports, "colors", { enumerable: true, get: function () { return cli_utils_1.colors; } });
+Object.defineProperty(exports, "createSpinner", { enumerable: true, get: function () { return cli_utils_1.createSpinner; } });
+Object.defineProperty(exports, "fatal", { enumerable: true, get: function () { return cli_utils_1.fatal; } });
+Object.defineProperty(exports, "error", { enumerable: true, get: function () { return cli_utils_1.error; } });
+Object.defineProperty(exports, "warning", { enumerable: true, get: function () { return cli_utils_1.warning; } });
+Object.defineProperty(exports, "hint", { enumerable: true, get: function () { return cli_utils_1.hint; } });
+Object.defineProperty(exports, "success", { enumerable: true, get: function () { return cli_utils_1.success; } });
+Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return cli_utils_1.confirm; } });
+Object.defineProperty(exports, "select", { enumerable: true, get: function () { return cli_utils_1.select; } });
+Object.defineProperty(exports, "formatBytes", { enumerable: true, get: function () { return cli_utils_1.formatBytes; } });
+Object.defineProperty(exports, "formatDuration", { enumerable: true, get: function () { return cli_utils_1.formatDuration; } });
+Object.defineProperty(exports, "progressBar", { enumerable: true, get: function () { return cli_utils_1.progressBar; } });
+Object.defineProperty(exports, "requireInit", { enumerable: true, get: function () { return cli_utils_1.requireInit; } });
+const cli_utils_2 = require("./cli-utils.cjs");
 function info(message) {
     console.log(message);
 }
@@ -110,7 +86,7 @@ function getWorkingTreeStatus(projectRoot = process.cwd()) {
 }
 function requireRepository(projectRoot = process.cwd()) {
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        fatal('not a relq repository (or any of the parent directories): .relq');
+        (0, cli_utils_2.fatal)('not a relq repository (or any of the parent directories): .relq');
     }
 }
 function requireCleanWorkingTree(projectRoot = process.cwd(), operation = 'operation') {
@@ -136,44 +112,44 @@ function requireCleanWorkingTree(projectRoot = process.cwd(), operation = 'opera
 function printDirtyWorkingTreeError(status, operation) {
     console.log('');
     if (status.hasUnstagedChanges && status.hasUncommittedChanges) {
-        error(`Your local changes would be overwritten by ${operation}.`);
-        hint(`Commit your changes or stash them before you ${operation}.`);
+        (0, cli_utils_2.error)(`Your local changes would be overwritten by ${operation}.`);
+        (0, cli_utils_2.hint)(`Commit your changes or stash them before you ${operation}.`);
     }
     else if (status.hasUncommittedChanges) {
-        error(`You have uncommitted changes.`);
-        hint(`Please commit your changes before you ${operation}.`);
+        (0, cli_utils_2.error)(`You have uncommitted changes.`);
+        (0, cli_utils_2.hint)(`Please commit your changes before you ${operation}.`);
     }
     else {
-        error(`You have unstaged changes.`);
-        hint(`Please stage and commit your changes before you ${operation}.`);
+        (0, cli_utils_2.error)(`You have unstaged changes.`);
+        (0, cli_utils_2.hint)(`Please stage and commit your changes before you ${operation}.`);
     }
     console.log('');
     if (status.hasUncommittedChanges) {
         console.log(`Changes to be committed:`);
-        console.log(`  ${exports.colors.gray('(use "relq restore --staged <file>..." to unstage)')}`);
+        console.log(`  ${cli_utils_2.colors.gray('(use "relq restore --staged <file>..." to unstage)')}`);
         console.log('');
         for (const change of status.stagedChanges.slice(0, 10)) {
             const prefix = change.type === 'CREATE' ? 'new' : change.type === 'DROP' ? 'deleted' : 'modified';
-            const color = change.type === 'CREATE' ? exports.colors.green : change.type === 'DROP' ? exports.colors.red : exports.colors.yellow;
+            const color = change.type === 'CREATE' ? cli_utils_2.colors.green : change.type === 'DROP' ? cli_utils_2.colors.red : cli_utils_2.colors.yellow;
             console.log(`\t${color(`${prefix}:`.padEnd(12))}${change.objectName}`);
         }
         if (status.stagedChanges.length > 10) {
-            console.log(`\t${exports.colors.gray(`... and ${status.stagedChanges.length - 10} more`)}`);
+            console.log(`\t${cli_utils_2.colors.gray(`... and ${status.stagedChanges.length - 10} more`)}`);
         }
         console.log('');
     }
     if (status.hasUnstagedChanges) {
         console.log(`Changes not staged for commit:`);
-        console.log(`  ${exports.colors.gray('(use "relq add <file>..." to update what will be committed)')}`);
-        console.log(`  ${exports.colors.gray('(use "relq restore <file>..." to discard changes in working directory)')}`);
+        console.log(`  ${cli_utils_2.colors.gray('(use "relq add <file>..." to update what will be committed)')}`);
+        console.log(`  ${cli_utils_2.colors.gray('(use "relq restore <file>..." to discard changes in working directory)')}`);
         console.log('');
         for (const change of status.unstagedChanges.slice(0, 10)) {
             const prefix = change.type === 'CREATE' ? 'new' : change.type === 'DROP' ? 'deleted' : 'modified';
-            const color = change.type === 'CREATE' ? exports.colors.green : change.type === 'DROP' ? exports.colors.red : exports.colors.yellow;
+            const color = change.type === 'CREATE' ? cli_utils_2.colors.green : change.type === 'DROP' ? cli_utils_2.colors.red : cli_utils_2.colors.yellow;
             console.log(`\t${color(`${prefix}:`.padEnd(12))}${change.objectName}`);
         }
         if (status.unstagedChanges.length > 10) {
-            console.log(`\t${exports.colors.gray(`... and ${status.unstagedChanges.length - 10} more`)}`);
+            console.log(`\t${cli_utils_2.colors.gray(`... and ${status.unstagedChanges.length - 10} more`)}`);
         }
         console.log('');
     }
@@ -209,23 +185,23 @@ function detectConflicts(localChanges, incomingChanges) {
 }
 function printConflictError(conflictInfo, operation) {
     console.log('');
-    error(`Automatic ${operation} failed; fix conflicts and then commit the result.`);
+    (0, cli_utils_2.error)(`Automatic ${operation} failed; fix conflicts and then commit the result.`);
     console.log('');
     console.log(`CONFLICT (content): Merge conflict in schema`);
     console.log('');
     for (const conflict of conflictInfo.conflicts.slice(0, 10)) {
-        console.log(`  ${exports.colors.red('both modified:')}   ${conflict.objectType.toLowerCase()} ${conflict.objectName}`);
+        console.log(`  ${cli_utils_2.colors.red('both modified:')}   ${conflict.objectType.toLowerCase()} ${conflict.objectName}`);
     }
     if (conflictInfo.conflicts.length > 10) {
-        console.log(`  ${exports.colors.gray(`... and ${conflictInfo.conflicts.length - 10} more conflicts`)}`);
+        console.log(`  ${cli_utils_2.colors.gray(`... and ${conflictInfo.conflicts.length - 10} more conflicts`)}`);
     }
     console.log('');
-    hint(`Fix conflicts manually and use:`);
-    hint(`  relq add .          - to mark resolution`);
-    hint(`  relq commit         - to complete the ${operation}`);
+    (0, cli_utils_2.hint)(`Fix conflicts manually and use:`);
+    (0, cli_utils_2.hint)(`  relq add .          - to mark resolution`);
+    (0, cli_utils_2.hint)(`  relq commit         - to complete the ${operation}`);
     console.log('');
-    hint(`Or abort the ${operation} with:`);
-    hint(`  relq ${operation} --abort`);
+    (0, cli_utils_2.hint)(`Or abort the ${operation} with:`);
+    (0, cli_utils_2.hint)(`  relq ${operation} --abort`);
     console.log('');
 }
 function checkUncommittedChanges(projectRoot = process.cwd()) {
@@ -244,10 +220,10 @@ function checkUncommittedChanges(projectRoot = process.cwd()) {
 function printMergeStrategyHelp() {
     console.log('');
     console.log('Resolution options:');
-    console.log(`  ${exports.colors.cyan('--theirs')}   Accept all incoming changes (overwrite local)`);
-    console.log(`  ${exports.colors.cyan('--ours')}     Keep all local changes (reject incoming)`);
-    console.log(`  ${exports.colors.cyan('--force')}    Force operation, overwrite local changes`);
-    console.log(`  ${exports.colors.cyan('--abort')}    Abort and restore previous state`);
+    console.log(`  ${cli_utils_2.colors.cyan('--theirs')}   Accept all incoming changes (overwrite local)`);
+    console.log(`  ${cli_utils_2.colors.cyan('--ours')}     Keep all local changes (reject incoming)`);
+    console.log(`  ${cli_utils_2.colors.cyan('--force')}    Force operation, overwrite local changes`);
+    console.log(`  ${cli_utils_2.colors.cyan('--abort')}    Abort and restore previous state`);
     console.log('');
 }
 function validatePostgresSQL(content) {
@@ -307,98 +283,3 @@ function readSQLFile(filePath) {
     const validation = validatePostgresSQL(content);
     return { content, validation };
 }
-function createSpinner() {
-    const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-    let frameIndex = 0;
-    let interval = null;
-    let currentMessage = '';
-    return {
-        start(message) {
-            currentMessage = message;
-            if (process.stdout.isTTY) {
-                interval = setInterval(() => {
-                    process.stdout.write(`\r${frames[frameIndex]} ${currentMessage}`);
-                    frameIndex = (frameIndex + 1) % frames.length;
-                }, 80);
-            }
-            else {
-                console.log(`  ${message}...`);
-            }
-        },
-        stop() {
-            if (interval) {
-                clearInterval(interval);
-                interval = null;
-                if (process.stdout.isTTY) {
-                    process.stdout.write('\r' + ' '.repeat(currentMessage.length + 4) + '\r');
-                }
-            }
-        },
-        succeed(message) {
-            this.stop();
-            console.log(`${exports.colors.green('✓')} ${message}`);
-        },
-        fail(message) {
-            this.stop();
-            console.log(`${exports.colors.red('✗')} ${message}`);
-        },
-        info(message) {
-            this.stop();
-            console.log(`${exports.colors.blue('ℹ')} ${message}`);
-        },
-    };
-}
-const readline = __importStar(require("readline"));
-function confirm(question, defaultYes = true) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    const suffix = defaultYes ? '[Y/n]' : '[y/N]';
-    return new Promise((resolve) => {
-        rl.question(`${question} ${exports.colors.gray(suffix)} `, (answer) => {
-            rl.close();
-            const a = answer.trim().toLowerCase();
-            if (!a)
-                resolve(defaultYes);
-            else
-                resolve(a === 'y' || a === 'yes');
-        });
-    });
-}
-function select(question, options) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    console.log(question);
-    options.forEach((opt, i) => {
-        console.log(`  ${i + 1}) ${opt}`);
-    });
-    return new Promise((resolve) => {
-        rl.question(`${exports.colors.gray('Select [1-' + options.length + ']:')} `, (answer) => {
-            rl.close();
-            const num = parseInt(answer.trim(), 10);
-            if (num >= 1 && num <= options.length) {
-                resolve(num - 1);
-            }
-            else {
-                resolve(0);
-            }
-        });
-    });
-}
-function formatBytes(bytes) {
-    if (bytes < 1024)
-        return `${bytes} B`;
-    if (bytes < 1024 * 1024)
-        return `${(bytes / 1024).toFixed(1)} KB`;
-    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-}
-function formatDuration(ms) {
-    if (ms < 1000)
-        return `${ms}ms`;
-    if (ms < 60000)
-        return `${(ms / 1000).toFixed(1)}s`;
-    return `${Math.floor(ms / 60000)}m ${Math.floor((ms % 60000) / 1000)}s`;
-}

package/dist/cjs/cli/utils/pool-manager.cjs

@@ -0,0 +1,156 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPool = getPool;
+exports.releasePool = releasePool;
+exports.withPool = withPool;
+exports.withClient = withClient;
+exports.withTransaction = withTransaction;
+exports.closeAllPools = closeAllPools;
+exports.getActivePoolCount = getActivePoolCount;
+const pools = new Map();
+const IDLE_TIMEOUT = 30000;
+let cleanupInterval = null;
+function getPoolKey(config) {
+    if (config.url) {
+        return config.url;
+    }
+    return `${config.host || 'localhost'}:${config.port || 5432}/${config.database}@${config.user}`;
+}
+function startCleanupInterval() {
+    if (cleanupInterval)
+        return;
+    cleanupInterval = setInterval(() => {
+        const now = Date.now();
+        for (const [key, entry] of pools.entries()) {
+            if (entry.refCount === 0 && now - entry.lastUsed > IDLE_TIMEOUT) {
+                entry.pool.end().catch(() => { });
+                pools.delete(key);
+            }
+        }
+        if (pools.size === 0 && cleanupInterval) {
+            clearInterval(cleanupInterval);
+            cleanupInterval = null;
+        }
+    }, IDLE_TIMEOUT);
+    cleanupInterval.unref();
+}
+async function getPool(config) {
+    const key = getPoolKey(config);
+    let entry = pools.get(key);
+    if (entry) {
+        entry.refCount++;
+        entry.lastUsed = Date.now();
+        return entry.pool;
+    }
+    const { Pool } = await Promise.resolve().then(() => __importStar(require("../../addon/pg/index.cjs")));
+    const pool = new Pool({
+        host: config.host,
+        port: config.port || 5432,
+        database: config.database,
+        user: config.user,
+        password: config.password,
+        connectionString: config.url,
+        ssl: config.ssl,
+        max: config.max || 10,
+        idleTimeoutMillis: config.idleTimeoutMillis || 10000,
+        connectionTimeoutMillis: config.connectionTimeoutMillis || 5000,
+    });
+    entry = {
+        pool,
+        refCount: 1,
+        lastUsed: Date.now(),
+    };
+    pools.set(key, entry);
+    startCleanupInterval();
+    return pool;
+}
+function releasePool(config) {
+    const key = getPoolKey(config);
+    const entry = pools.get(key);
+    if (entry && entry.refCount > 0) {
+        entry.refCount--;
+        entry.lastUsed = Date.now();
+    }
+}
+async function withPool(config, fn) {
+    const pool = await getPool(config);
+    try {
+        return await fn(pool);
+    }
+    finally {
+        releasePool(config);
+    }
+}
+async function withClient(config, fn) {
+    const pool = await getPool(config);
+    const client = await pool.connect();
+    try {
+        return await fn(client);
+    }
+    finally {
+        client.release();
+        releasePool(config);
+    }
+}
+async function withTransaction(config, fn) {
+    return withClient(config, async (client) => {
+        await client.query('BEGIN');
+        try {
+            const result = await fn(client);
+            await client.query('COMMIT');
+            return result;
+        }
+        catch (error) {
+            await client.query('ROLLBACK');
+            throw error;
+        }
+    });
+}
+async function closeAllPools() {
+    if (cleanupInterval) {
+        clearInterval(cleanupInterval);
+        cleanupInterval = null;
+    }
+    const closePromises = [];
+    for (const [key, entry] of pools.entries()) {
+        closePromises.push(entry.pool.end());
+        pools.delete(key);
+    }
+    await Promise.all(closePromises);
+}
+function getActivePoolCount() {
+    return pools.size;
+}

package/dist/cjs/cli/utils/project-root.cjs

@@ -0,0 +1,107 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findProjectRoot = findProjectRoot;
+exports.getRelqDir = getRelqDir;
+exports.getProjectRoot = getProjectRoot;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+const CONFIG_FILENAMES = [
+    'relq.config.ts',
+    'relq.config.js',
+    'relq.config.mjs',
+];
+function hasProjectMarker(dir) {
+    for (const filename of CONFIG_FILENAMES) {
+        if (fs.existsSync(path.join(dir, filename))) {
+            return true;
+        }
+    }
+    if (fs.existsSync(path.join(dir, 'package.json'))) {
+        return true;
+    }
+    return false;
+}
+function findProjectRoot(startDir = process.cwd()) {
+    let currentDir = path.resolve(startDir);
+    const root = path.parse(currentDir).root;
+    const homeDir = os.homedir();
+    while (currentDir !== root) {
+        if (hasProjectMarker(currentDir)) {
+            return currentDir;
+        }
+        if (currentDir === homeDir) {
+            return null;
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    return null;
+}
+function getRelqDir(startDir = process.cwd()) {
+    const projectRoot = findProjectRoot(startDir);
+    if (!projectRoot) {
+        const colors = {
+            red: (s) => `\x1b[31m${s}\x1b[0m`,
+            yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+            cyan: (s) => `\x1b[36m${s}\x1b[0m`,
+        };
+        console.error('');
+        console.error(colors.red('fatal:') + ' not a relq project (or any of the parent directories)');
+        console.error('');
+        console.error(colors.yellow('hint:') + ` Run ${colors.cyan('relq init')} in your project directory to initialize relq.`);
+        console.error('');
+        process.exit(128);
+    }
+    return path.join(projectRoot, '.relq');
+}
+function getProjectRoot(startDir = process.cwd()) {
+    const projectRoot = findProjectRoot(startDir);
+    if (!projectRoot) {
+        const colors = {
+            red: (s) => `\x1b[31m${s}\x1b[0m`,
+            yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+            cyan: (s) => `\x1b[36m${s}\x1b[0m`,
+        };
+        console.error('');
+        console.error(colors.red('fatal:') + ' not a relq project (or any of the parent directories)');
+        console.error('');
+        console.error(colors.yellow('hint:') + ` Run ${colors.cyan('relq init')} in your project directory to initialize relq.`);
+        console.error('');
+        process.exit(128);
+    }
+    return projectRoot;
+}
+exports.default = { findProjectRoot, getRelqDir, getProjectRoot };