relq 1.0.2 → 1.0.3

package/dist/cjs/cli/commands/log.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logCommand = logCommand;
 exports.historyCommand = logCommand;
 exports.showCommand = showCommand;
-const spinner_1 = require("../utils/spinner.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 function formatDate(timestamp) {
     const date = new Date(timestamp);
@@ -17,43 +17,38 @@ function formatDate(timestamp) {
     return `${dayName} ${monthName} ${day} ${time} ${year}`;
 }
 async function logCommand(context) {
-    const { flags } = context;
-    const projectRoot = process.cwd();
+    const { flags, projectRoot } = context;
     const limit = parseInt(flags['n']) || 10;
     const oneline = flags['oneline'] === true;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq init')} ${spinner_1.colors.muted('to initialize.')}`);
-        return;
+        (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', "run 'relq init' to initialize");
     }
     const head = (0, repo_manager_1.getHead)(projectRoot);
     const commits = (0, repo_manager_1.getCommitHistory)(limit, projectRoot);
     if (commits.length === 0) {
-        console.log(`${spinner_1.colors.muted('No commits yet.')}`);
-        console.log('');
-        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq commit -m "message"')} ${spinner_1.colors.muted('to create first commit.')}`);
+        console.log('No commits yet.');
+        (0, cli_utils_1.hint)("run 'relq commit -m <message>' to create first commit");
         console.log('');
         return;
     }
     for (const commit of commits) {
         const isHead = commit.hash === head;
         if (oneline) {
-            const headMarker = isHead ? `${spinner_1.colors.cyan('(HEAD)')} ` : '';
-            console.log(`${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${headMarker}${commit.message}`);
+            const headMarker = isHead ? `${cli_utils_1.colors.cyan('(HEAD)')} ` : '';
+            console.log(`${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${headMarker}${commit.message}`);
         }
         else {
-            console.log(`${spinner_1.colors.yellow(`commit ${commit.hash}`)}`);
+            console.log(`${cli_utils_1.colors.yellow(`commit ${commit.hash}`)}`);
             if (isHead) {
-                console.log(`${spinner_1.colors.cyan('(HEAD)')}`);
+                console.log(`${cli_utils_1.colors.cyan('(HEAD)')}`);
             }
             console.log(`Author: ${commit.author}`);
             console.log(`Date:   ${formatDate(commit.timestamp)}`);
             console.log('');
             console.log(`    ${commit.message}`);
             console.log('');
-            console.log(`    ${spinner_1.colors.muted(`${commit.stats.tables} tables, ${commit.stats.columns} columns`)}`);
+            console.log(`    ${cli_utils_1.colors.muted(`${commit.stats.tables} tables, ${commit.stats.columns} columns`)}`);
             console.log('');
         }
     }
@@ -62,18 +57,17 @@ async function logCommand(context) {
     }
 }
 async function showCommand(context) {
-    const { args } = context;
-    const projectRoot = process.cwd();
+    const { args, projectRoot } = context;
     const target = args[0];
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
+        console.log(`${cli_utils_1.colors.red('fatal:')} not a relq repository`);
         return;
     }
     if (!target) {
-        console.log(`${spinner_1.colors.red('error:')} Please specify a commit or tag`);
+        console.log(`${cli_utils_1.colors.red('error:')} Please specify a commit or tag`);
         console.log('');
-        console.log(`Usage: ${spinner_1.colors.cyan('relq show <commit|tag>')}`);
+        console.log(`Usage: ${cli_utils_1.colors.cyan('relq show <commit|tag>')}`);
         console.log('');
         return;
     }
@@ -82,56 +76,56 @@ async function showCommand(context) {
     const { resolveRef, loadCommit } = require("../utils/repo-manager.cjs");
     const hash = resolveRef(target, projectRoot);
     if (!hash) {
-        console.log(`${spinner_1.colors.red('error:')} Commit or tag not found: ${target}`);
+        console.log(`${cli_utils_1.colors.red('error:')} Commit or tag not found: ${target}`);
         console.log('');
         console.log('Available commits:');
         const commitsDir = path.join(projectRoot, '.relq', 'commits');
         if (fs.existsSync(commitsDir)) {
             const files = fs.readdirSync(commitsDir);
             for (const f of files.slice(0, 5)) {
-                console.log(`   ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(f.replace('.json', '')))}`);
+                console.log(`   ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(f.replace('.json', '')))}`);
             }
         }
         return;
     }
     const commitPath = path.join(projectRoot, '.relq', 'commits', `${hash}.json`);
     if (!fs.existsSync(commitPath)) {
-        console.log(`${spinner_1.colors.red('error:')} Commit not found: ${hash}`);
+        console.log(`${cli_utils_1.colors.red('error:')} Commit not found: ${hash}`);
         return;
     }
     const commitData = JSON.parse(fs.readFileSync(commitPath, 'utf-8'));
-    console.log(`${spinner_1.colors.yellow(`commit ${commitData.hash}`)}`);
+    console.log(`${cli_utils_1.colors.yellow(`commit ${commitData.hash}`)}`);
     console.log(`Author: ${commitData.author}`);
     console.log(`Date:   ${formatDate(commitData.timestamp)}`);
     console.log('');
     console.log(`    ${commitData.message}`);
     console.log('');
     if (commitData.stats) {
-        console.log(`${spinner_1.colors.bold('Stats:')}`);
+        console.log(`${cli_utils_1.colors.bold('Stats:')}`);
         console.log(`    Tables:  ${commitData.stats.tables}`);
         console.log(`    Columns: ${commitData.stats.columns}`);
         console.log(`    Indexes: ${commitData.stats.indexes || 0}`);
         console.log('');
     }
     if (commitData.changes && commitData.changes.length > 0) {
-        console.log(`${spinner_1.colors.bold('Changes:')}`);
+        console.log(`${cli_utils_1.colors.bold('Changes:')}`);
         for (const change of commitData.changes.slice(0, 20)) {
             const symbol = change.action === 'CREATE'
-                ? spinner_1.colors.green('+')
+                ? cli_utils_1.colors.green('+')
                 : change.action === 'DROP'
-                    ? spinner_1.colors.red('-')
-                    : spinner_1.colors.yellow('~');
+                    ? cli_utils_1.colors.red('-')
+                    : cli_utils_1.colors.yellow('~');
             console.log(`    ${symbol} ${change.objectType.toLowerCase()}: ${change.name}`);
         }
         if (commitData.changes.length > 20) {
-            console.log(`    ${spinner_1.colors.muted(`... and ${commitData.changes.length - 20} more`)}`);
+            console.log(`    ${cli_utils_1.colors.muted(`... and ${commitData.changes.length - 20} more`)}`);
         }
         console.log('');
     }
     if (commitData.sql && commitData.sql.trim()) {
-        console.log(`${spinner_1.colors.bold('SQL:')}`);
+        console.log(`${cli_utils_1.colors.bold('SQL:')}`);
         console.log('');
-        console.log(`${spinner_1.colors.cyan(commitData.sql)}`);
+        console.log(`${cli_utils_1.colors.cyan(commitData.sql)}`);
         console.log('');
     }
 }

package/dist/cjs/cli/commands/merge.cjs

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeCommand = mergeCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const spinner_1 = require("../utils/spinner.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 function loadBranchState(projectRoot) {
     const branchPath = path.join(projectRoot, '.relq', 'branches.json');
@@ -51,12 +51,10 @@ function saveBranchState(state, projectRoot) {
     fs.writeFileSync(branchPath, JSON.stringify(state, null, 2));
 }
 async function mergeCommand(context) {
-    const { config, args, flags } = context;
-    const projectRoot = process.cwd();
+    const { config, args, flags, projectRoot } = context;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
-        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
-        return;
+        (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${cli_utils_1.colors.cyan('relq init')} to initialize.`);
     }
     const branchName = args[0];
     const abort = flags['abort'] === true;
@@ -64,47 +62,36 @@ async function mergeCommand(context) {
     if (abort) {
         if (fs.existsSync(mergeStatePath)) {
             fs.unlinkSync(mergeStatePath);
-            console.log(`${spinner_1.colors.green('✓')} Merge aborted`);
+            console.log('Merge aborted');
+            console.log('');
+            return;
         }
         else {
-            console.log(`${spinner_1.colors.muted('No merge in progress.')}`);
+            (0, cli_utils_1.fatal)('There is no merge to abort (MERGE_STATE missing)');
         }
-        console.log('');
-        return;
     }
     if (fs.existsSync(mergeStatePath)) {
         const mergeState = JSON.parse(fs.readFileSync(mergeStatePath, 'utf-8'));
-        console.log(`${spinner_1.colors.red('error:')} Merge in progress from '${mergeState.fromBranch}'`);
-        console.log('');
-        console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq resolve')} ${spinner_1.colors.muted('to resolve conflicts')}`);
-        console.log(`${spinner_1.colors.muted('Or')} ${spinner_1.colors.cyan('relq merge --abort')} ${spinner_1.colors.muted('to cancel')}`);
-        console.log('');
-        return;
+        (0, cli_utils_1.fatal)(`Merge in progress from '${mergeState.fromBranch}'`, `Use ${cli_utils_1.colors.cyan('relq resolve')} to resolve conflicts\nOr ${cli_utils_1.colors.cyan('relq merge --abort')} to cancel`);
     }
     if (!branchName) {
-        console.log(`${spinner_1.colors.red('error:')} Please specify a branch to merge`);
-        console.log('');
-        console.log(`Usage: ${spinner_1.colors.cyan('relq merge <branch>')}`);
-        console.log('');
-        return;
+        (0, cli_utils_1.fatal)('Please specify a branch to merge', `Usage: ${cli_utils_1.colors.cyan('relq merge <branch>')}`);
     }
     const state = loadBranchState(projectRoot);
     if (!state.branches[branchName]) {
-        console.log(`${spinner_1.colors.red('error:')} Branch not found: ${branchName}`);
-        return;
+        (0, cli_utils_1.fatal)(`Branch not found: ${branchName}`, `Use ${cli_utils_1.colors.cyan('relq branch')} to list available branches.`);
     }
     if (branchName === state.current) {
-        console.log(`${spinner_1.colors.red('error:')} Cannot merge branch into itself`);
-        return;
+        (0, cli_utils_1.fatal)('Cannot merge branch into itself');
     }
-    const spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     spinner.start(`Merging '${branchName}' into '${state.current}'...`);
     try {
         const currentHash = (0, repo_manager_1.getHead)(projectRoot);
         const incomingHash = state.branches[branchName];
         if (!currentHash || !incomingHash) {
-            spinner.fail('No commits to merge');
-            return;
+            spinner.stop();
+            (0, cli_utils_1.fatal)('No commits to merge', `Run ${cli_utils_1.colors.cyan('relq pull')} first.`);
         }
         if (currentHash === incomingHash) {
             spinner.succeed('Already up to date');
@@ -114,14 +101,14 @@ async function mergeCommand(context) {
         const currentCommit = (0, repo_manager_1.loadCommit)(currentHash, projectRoot);
         const incomingCommit = (0, repo_manager_1.loadCommit)(incomingHash, projectRoot);
         if (!currentCommit || !incomingCommit) {
-            spinner.fail('Cannot load commit data');
-            return;
+            spinner.stop();
+            (0, cli_utils_1.fatal)('Cannot load commit data - repository may be corrupt');
         }
         const currentSnapshot = (0, repo_manager_1.loadSnapshot)(projectRoot) || currentCommit.schema;
         const incomingSnapshot = incomingCommit.schema;
         if (!currentSnapshot || !incomingSnapshot) {
-            spinner.fail('No snapshot data');
-            return;
+            spinner.stop();
+            (0, cli_utils_1.fatal)('No snapshot data - repository may be corrupt');
         }
         const conflicts = detectMergeConflicts(currentSnapshot, incomingSnapshot);
         if (conflicts.length > 0) {
@@ -137,16 +124,12 @@ async function mergeCommand(context) {
             console.log('');
             for (const c of conflicts.slice(0, 5)) {
                 const name = c.parentName ? `${c.parentName}.${c.objectName}` : c.objectName;
-                console.log(`   ${spinner_1.colors.red('conflict:')} ${c.objectType.toLowerCase()} ${name}`);
+                console.log(`   ${cli_utils_1.colors.red('conflict:')} ${c.objectType.toLowerCase()} ${name}`);
             }
             if (conflicts.length > 5) {
-                console.log(`   ${spinner_1.colors.muted(`... and ${conflicts.length - 5} more`)}`);
+                console.log(`   ${cli_utils_1.colors.muted(`... and ${conflicts.length - 5} more`)}`);
             }
-            console.log('');
-            console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq resolve --all-theirs')} ${spinner_1.colors.muted('to accept incoming')}`);
-            console.log(`${spinner_1.colors.muted('Or')} ${spinner_1.colors.cyan('relq merge --abort')} ${spinner_1.colors.muted('to cancel')}`);
-            console.log('');
-            return;
+            (0, cli_utils_1.fatal)(`Automatic merge failed; fix conflicts and then commit`, `Use ${cli_utils_1.colors.cyan('relq resolve --all-theirs')} to accept incoming\nOr ${cli_utils_1.colors.cyan('relq merge --abort')} to cancel`);
         }
         const mergedSnapshot = mergeSnapshots(currentSnapshot, incomingSnapshot);
         (0, repo_manager_1.saveSnapshot)(mergedSnapshot, projectRoot);
@@ -154,12 +137,12 @@ async function mergeCommand(context) {
         const message = `Merge branch '${branchName}' into ${state.current}`;
         const commit = (0, repo_manager_1.createCommit)(mergedSnapshot, author, message, projectRoot);
         spinner.succeed(`Merged '${branchName}' into '${state.current}'`);
-        console.log(`   ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${message}`);
+        console.log(`   ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${message}`);
         console.log('');
     }
-    catch (error) {
+    catch (err) {
         spinner.fail('Merge failed');
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
+        (0, cli_utils_1.fatal)(err instanceof Error ? err.message : String(err));
     }
 }
 function detectMergeConflicts(current, incoming) {

package/dist/cjs/cli/commands/migrate.cjs

@@ -36,9 +36,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateCommand = migrateCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const readline = __importStar(require("readline"));
 const config_loader_1 = require("../utils/config-loader.cjs");
 const env_loader_1 = require("../utils/env-loader.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 function parseMigration(content) {
     const upMatch = content.match(/--\s*UP\s*\n([\s\S]*?)(?=--\s*DOWN|$)/i);
     const downMatch = content.match(/--\s*DOWN\s*\n([\s\S]*?)$/i);
@@ -47,31 +47,19 @@ function parseMigration(content) {
         down: downMatch?.[1]?.trim() || '',
     };
 }
-function askConfirm(question) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    return new Promise((resolve) => {
-        rl.question(`${question} [y/N]: `, (answer) => {
-            rl.close();
-            resolve(answer.trim().toLowerCase() === 'y');
-        });
-    });
-}
 async function migrateCommand(context) {
     const { config, flags } = context;
     if (!config) {
-        console.error('Error: No configuration found.');
-        process.exit(1);
+        (0, cli_utils_1.fatal)('No configuration found', `run ${cli_utils_1.colors.cyan('relq init')} to create a configuration file`);
+        return;
     }
-    (0, config_loader_1.requireValidConfig)(config);
+    await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'migrate' });
     const dryRun = flags['dry-run'] === true;
     const force = flags['force'] === true;
     const connection = config.connection;
     const migrationsDir = config.migrations?.directory || './migrations';
     const tableName = config.migrations?.tableName || '_relq_migrations';
-    console.log('🔄 Running migrations...');
+    console.log('Running migrations...');
     console.log(`   Connection: ${(0, env_loader_1.getConnectionDescription)(connection)}`);
     console.log(`   Migrations: ${migrationsDir}\n`);
     try {
@@ -105,16 +93,16 @@ async function migrateCommand(context) {
                 .sort();
             const pending = migrationFiles.filter(f => !appliedMigrations.has(f));
             if (pending.length === 0) {
-                console.log('✅ No pending migrations.');
+                console.log('No pending migrations.');
                 return;
             }
-            console.log(`📋 Pending migrations (${pending.length}):`);
+            console.log(`Pending migrations (${pending.length}):`);
             for (const file of pending) {
                 console.log(`   • ${file}`);
             }
             console.log('');
             if (!force && !dryRun) {
-                if (!await askConfirm('Apply these migrations?')) {
+                if (!await (0, cli_utils_1.confirm)('Apply these migrations?', false)) {
                     console.log('Cancelled.');
                     return;
                 }
@@ -124,7 +112,7 @@ async function migrateCommand(context) {
                 const content = fs.readFileSync(filePath, 'utf-8');
                 const { up } = parseMigration(content);
                 if (!up) {
-                    console.log(`⚠️  Skipping ${file} (no UP section)`);
+                    (0, cli_utils_1.warning)(`Skipping ${file} (no UP section)`);
                     continue;
                 }
                 if (dryRun) {
@@ -141,7 +129,7 @@ async function migrateCommand(context) {
                         await client.query(up);
                         await client.query(`INSERT INTO "${tableName}" (name) VALUES ($1)`, [file]);
                         await client.query('COMMIT');
-                        console.log(`   ✅ Applied`);
+                        console.log('   Applied');
                     }
                     catch (error) {
                         await client.query('ROLLBACK');
@@ -153,7 +141,7 @@ async function migrateCommand(context) {
                 }
             }
             if (!dryRun) {
-                console.log(`\n✅ Applied ${pending.length} migration(s).`);
+                console.log(`\nApplied ${pending.length} migration(s).`);
             }
         }
         finally {
@@ -161,7 +149,6 @@ async function migrateCommand(context) {
         }
     }
     catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : error);
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Migration failed', error instanceof Error ? error.message : String(error));
     }
 }