relq 1.0.1 → 1.0.3

package/dist/cjs/cli/commands/diff.cjs

@@ -2,83 +2,158 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.diffCommand = diffCommand;
 const config_loader_1 = require("../utils/config-loader.cjs");
-const schema_introspect_1 = require("../utils/schema-introspect.cjs");
-const snapshot_manager_1 = require("../utils/snapshot-manager.cjs");
-const schema_diff_1 = require("../utils/schema-diff.cjs");
-const schema_hash_1 = require("../utils/schema-hash.cjs");
-const schema_diff_2 = require("../utils/schema-diff.cjs");
-const migration_generator_1 = require("../utils/migration-generator.cjs");
+const fast_introspect_1 = require("../utils/fast-introspect.cjs");
 const env_loader_1 = require("../utils/env-loader.cjs");
-const colors = {
-    reset: '\x1b[0m',
-    bold: '\x1b[1m',
-    dim: '\x1b[2m',
-    red: '\x1b[31m',
-    green: '\x1b[32m',
-    yellow: '\x1b[33m',
-    blue: '\x1b[34m',
-    cyan: '\x1b[36m',
-    magenta: '\x1b[35m',
-};
-function filterDiff(diff, ignorePatterns) {
-    const patterns = ignorePatterns.map(p => {
-        const regexStr = p.replace(/\*/g, '.*').replace(/\?/g, '.');
-        return new RegExp(`^${regexStr}$`, 'i');
-    });
-    const matchesPattern = (name) => patterns.some(p => p.test(name));
-    const tables = diff.tables.filter(t => !matchesPattern(t.name));
-    const hasChanges = tables.length > 0 || diff.extensions.length > 0;
-    return {
-        ...diff,
-        tables,
-        hasChanges,
-    };
-}
+const cli_utils_1 = require("../utils/cli-utils.cjs");
+const repo_manager_1 = require("../utils/repo-manager.cjs");
+const change_tracker_1 = require("../utils/change-tracker.cjs");
 async function diffCommand(context) {
-    const { config, flags } = context;
-    if (!config) {
-        console.error('Error: No configuration found.');
-        process.exit(1);
+    const { config, args, flags, projectRoot } = context;
+    console.log('');
+    if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
+        (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${cli_utils_1.colors.cyan('relq init')} to initialize.`);
     }
-    (0, config_loader_1.requireValidConfig)(config);
-    const connection = config.connection;
-    const snapshotPath = config.sync?.snapshot || '.relq/snapshot.json';
-    const ignorePatterns = config.sync?.ignore || ['_relq_*'];
     const showSQL = flags['sql'] === true;
-    console.log(`${colors.bold}Comparing:${colors.reset} local snapshot ↔ ${(0, env_loader_1.getConnectionDescription)(connection)}`);
-    console.log('');
-    try {
-        const dbSchema = await (0, schema_introspect_1.introspectDatabase)(connection);
-        const snapshot = (0, snapshot_manager_1.loadSnapshot)(snapshotPath);
-        if (!snapshot) {
-            console.log(`${colors.yellow}No snapshot found.${colors.reset}`);
-            console.log(`Run "${colors.cyan}relq pull${colors.reset}" to create initial snapshot.`);
-            return;
+    const staged = flags['staged'] === true;
+    const target = args[0];
+    if (staged) {
+        await showStagedDiff(projectRoot, showSQL);
+        return;
+    }
+    if (target === 'remote/live' || target === 'remote' || target === 'live' || target === 'origin') {
+        if (!config) {
+            (0, cli_utils_1.fatal)('No configuration found', `Run ${cli_utils_1.colors.cyan('relq init')} to create one.`);
         }
-        const localSchema = (0, snapshot_manager_1.snapshotToDatabaseSchema)(snapshot);
-        const normalizedLocal = (0, schema_hash_1.normalizeSchema)(localSchema);
-        const normalizedDb = (0, schema_hash_1.normalizeSchema)(dbSchema);
-        const diff = (0, schema_diff_2.diffSchemas)(normalizedLocal, normalizedDb);
-        const filteredDiff = filterDiff(diff, ignorePatterns);
-        if (!filteredDiff.hasChanges) {
-            console.log(`${colors.green}No differences.${colors.reset}`);
-            return;
+        await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'diff' });
+        await showOriginDiff(config, projectRoot, showSQL);
+        return;
+    }
+    await showUnstagedDiff(projectRoot, showSQL);
+}
+function getSymbol(change) {
+    if (change.type === 'CREATE')
+        return cli_utils_1.colors.green('+');
+    if (change.type === 'DROP')
+        return cli_utils_1.colors.red('-');
+    return cli_utils_1.colors.yellow('~');
+}
+async function showUnstagedDiff(projectRoot, showSQL) {
+    const unstaged = (0, repo_manager_1.getUnstagedChanges)(projectRoot);
+    if (unstaged.length === 0) {
+        console.log(`${cli_utils_1.colors.green('No unstaged changes.')}`);
+        console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq diff remote/live')} ${cli_utils_1.colors.muted('to compare with remote.')}`);
+        console.log('');
+        return;
+    }
+    console.log(`${cli_utils_1.colors.bold('Unstaged changes:')}`);
+    console.log('');
+    const sorted = (0, change_tracker_1.sortChangesByDependency)(unstaged);
+    for (const change of sorted) {
+        console.log(`   ${getSymbol(change)} ${change.objectType.toLowerCase()}: ${(0, change_tracker_1.getChangeDisplayName)(change)}`);
+    }
+    if (showSQL) {
+        console.log('');
+        console.log(`${cli_utils_1.colors.bold('SQL:')}`);
+        for (const change of sorted) {
+            const sql = (0, change_tracker_1.generateChangeSQL)(change);
+            if (sql)
+                console.log(`${cli_utils_1.colors.cyan(sql)}`);
         }
-        console.log((0, schema_diff_1.formatDiff)(filteredDiff));
-        if (showSQL) {
-            console.log('');
-            console.log(`${colors.bold}Generated SQL:${colors.reset}`);
-            console.log('');
-            const { up } = (0, migration_generator_1.generateMigration)(filteredDiff, { includeDown: false });
-            for (const sql of up) {
-                console.log(`${colors.cyan}${sql}${colors.reset}`);
-            }
+    }
+    console.log('');
+    console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq add .')} ${cli_utils_1.colors.muted('to stage all.')}`);
+    console.log('');
+}
+async function showStagedDiff(projectRoot, showSQL) {
+    const staged = (0, repo_manager_1.getStagedChanges)(projectRoot);
+    if (staged.length === 0) {
+        console.log(`${cli_utils_1.colors.green('No staged changes.')}`);
+        console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq add .')} ${cli_utils_1.colors.muted('to stage changes.')}`);
+        console.log('');
+        return;
+    }
+    console.log(`${cli_utils_1.colors.bold('Staged changes:')}`);
+    console.log('');
+    const sorted = (0, change_tracker_1.sortChangesByDependency)(staged);
+    for (const change of sorted) {
+        console.log(`   ${getSymbol(change)} ${change.objectType.toLowerCase()}: ${(0, change_tracker_1.getChangeDisplayName)(change)}`);
+    }
+    if (showSQL) {
+        console.log('');
+        console.log(`${cli_utils_1.colors.bold('SQL:')}`);
+        for (const change of sorted) {
+            const sql = (0, change_tracker_1.generateChangeSQL)(change);
+            if (sql)
+                console.log(`${cli_utils_1.colors.cyan(sql)}`);
         }
+    }
+    console.log('');
+    console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq commit -m "message"')} ${cli_utils_1.colors.muted('to commit.')}`);
+    console.log('');
+}
+async function showOriginDiff(config, projectRoot, showSQL) {
+    const connection = config.connection;
+    const spinner = (0, cli_utils_1.createSpinner)();
+    const snapshot = (0, repo_manager_1.loadSnapshot)(projectRoot);
+    if (!snapshot) {
+        console.log(`${cli_utils_1.colors.yellow('No local snapshot.')}`);
+        console.log(`${cli_utils_1.colors.muted('Run')} ${cli_utils_1.colors.cyan('relq pull')} ${cli_utils_1.colors.muted('first.')}`);
+        console.log('');
+        return;
+    }
+    spinner.start(`Connecting to ${(0, env_loader_1.getConnectionDescription)(connection)}...`);
+    const remoteDb = await (0, fast_introspect_1.fastIntrospectDatabase)(connection, undefined, {
+        includeFunctions: config.includeFunctions ?? false,
+        includeTriggers: config.includeTriggers ?? false,
+    });
+    spinner.succeed(`Connected`);
+    const diffs = compareSchemas(snapshot, remoteDb);
+    if (diffs.length === 0) {
+        console.log('');
+        console.log('Local and remote are in sync.');
         console.log('');
-        console.log(`${colors.dim}Use "relq diff --sql" to see generated SQL statements.${colors.reset}`);
+        return;
+    }
+    console.log('');
+    console.log(`${cli_utils_1.colors.bold('Differences:')}`);
+    console.log('');
+    for (const d of diffs.slice(0, 20)) {
+        const sym = d.type === 'added' ? cli_utils_1.colors.green('+') : d.type === 'removed' ? cli_utils_1.colors.red('-') : cli_utils_1.colors.yellow('~');
+        console.log(`   ${sym} ${d.description}`);
     }
-    catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : error);
-        process.exit(1);
+    if (diffs.length > 20) {
+        console.log(`   ${cli_utils_1.colors.muted(`... and ${diffs.length - 20} more`)}`);
+    }
+    console.log('');
+    console.log(`${cli_utils_1.colors.muted('Use')} ${cli_utils_1.colors.cyan('relq pull')} ${cli_utils_1.colors.muted('to sync local with remote.')}`);
+    console.log('');
+}
+function compareSchemas(local, remote) {
+    const diffs = [];
+    const localTableNames = local.tables.map(t => t.name);
+    const remoteTableNames = (remote.tables || []).map((t) => t.name);
+    for (const name of remoteTableNames) {
+        if (!localTableNames.includes(name)) {
+            diffs.push({ type: 'added', description: `table: ${name}` });
+        }
+    }
+    for (const name of localTableNames) {
+        if (!remoteTableNames.includes(name)) {
+            diffs.push({ type: 'removed', description: `table: ${name}` });
+        }
+    }
+    const localEnumNames = local.enums.map(e => e.name);
+    const remoteEnumNames = (remote.enums || []).map((e) => e.name);
+    for (const name of remoteEnumNames) {
+        if (!localEnumNames.includes(name)) {
+            diffs.push({ type: 'added', description: `enum: ${name}` });
+        }
+    }
+    for (const name of localEnumNames) {
+        if (!remoteEnumNames.includes(name)) {
+            diffs.push({ type: 'removed', description: `enum: ${name}` });
+        }
     }
+    return diffs;
 }
+exports.default = diffCommand;

package/dist/cjs/cli/commands/export.cjs

@@ -41,10 +41,11 @@ const spinner_1 = require("../utils/spinner.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
 const sql_generator_1 = require("../utils/sql-generator.cjs");
+const relqignore_1 = require("../utils/relqignore.cjs");
+const config_1 = require("../../config/config.cjs");
 async function exportCommand(context) {
     const spinner = (0, spinner_1.createSpinner)();
-    const { args, flags } = context;
-    const projectRoot = process.cwd();
+    const { args, flags, projectRoot } = context;
     const changesOnly = Boolean(flags['changes']);
     const stagedOnly = Boolean(flags['staged']);
     const fromDb = Boolean(flags['db']);
@@ -82,7 +83,18 @@ async function exportFromSnapshot(projectRoot, absoluteOutputPath, options) {
         return;
     }
     spinner.succeed('Loaded snapshot');
-    const schema = normalizedToDbSchema(snapshot);
+    const config = await (0, config_1.loadConfig)();
+    const ignorePatterns = (0, relqignore_1.loadRelqignore)(projectRoot);
+    const filteredSnapshot = filterNormalizedSchema(snapshot, ignorePatterns, {
+        includeFunctions: config.includeFunctions ?? options.includeFunctions ?? false,
+        includeTriggers: config.includeTriggers ?? options.includeTriggers ?? false,
+        includeViews: config.includeViews ?? false,
+        includeFDW: config.includeFDW ?? false,
+    });
+    const schema = normalizedToDbSchema(filteredSnapshot);
+    const ignoredCount = (snapshot.tables.length - filteredSnapshot.tables.length) +
+        (snapshot.enums.length - filteredSnapshot.enums.length) +
+        ((snapshot.functions?.length || 0) - (filteredSnapshot.functions?.length || 0));
     console.log('');
     console.log(spinner_1.colors.cyan('Schema Summary:'));
     console.log(`  ${spinner_1.colors.green('•')} Tables: ${schema.tables.length}`);
@@ -91,11 +103,14 @@ async function exportFromSnapshot(projectRoot, absoluteOutputPath, options) {
     console.log(`  ${spinner_1.colors.green('•')} Composite Types: ${schema.compositeTypes.length}`);
     console.log(`  ${spinner_1.colors.green('•')} Sequences: ${schema.sequences?.length || 0}`);
     console.log(`  ${spinner_1.colors.green('•')} Extensions: ${schema.extensions.length}`);
-    if (snapshot.functions?.length) {
-        console.log(`  ${spinner_1.colors.green('•')} Functions: ${snapshot.functions.length}`);
+    if (filteredSnapshot.functions?.length) {
+        console.log(`  ${spinner_1.colors.green('•')} Functions: ${filteredSnapshot.functions.length}`);
+    }
+    if (filteredSnapshot.triggers?.length) {
+        console.log(`  ${spinner_1.colors.green('•')} Triggers: ${filteredSnapshot.triggers.length}`);
     }
-    if (snapshot.triggers?.length) {
-        console.log(`  ${spinner_1.colors.green('•')} Triggers: ${snapshot.triggers.length}`);
+    if (ignoredCount > 0) {
+        console.log(`  ${spinner_1.colors.muted(`${ignoredCount} object(s) filtered by .relqignore`)}`);
     }
     spinner.start('Generating SQL statements');
     const sqlContent = generateFullSQL(schema, options);
@@ -107,7 +122,7 @@ async function exportFromSnapshot(projectRoot, absoluteOutputPath, options) {
     fs.writeFileSync(absoluteOutputPath, sqlContent, 'utf-8');
     spinner.succeed(`Written ${options.output} (${(sqlContent.length / 1024).toFixed(1)} KB)`);
     console.log('');
-    console.log(spinner_1.colors.green('✓ Export completed!'));
+    console.log('Export completed');
     console.log(`  Source: ${spinner_1.colors.muted('snapshot (local)')}`);
     console.log(`  Output: ${spinner_1.colors.muted(options.output || '')}`);
 }
@@ -147,7 +162,7 @@ async function exportFromDatabase(context, absoluteOutputPath, options) {
         fs.writeFileSync(absoluteOutputPath, sqlContent, 'utf-8');
         spinner.succeed(`Written ${options.output} (${(sqlContent.length / 1024).toFixed(1)} KB)`);
         console.log('');
-        console.log(spinner_1.colors.green('✓ Export completed!'));
+        console.log('Export completed');
         console.log(`  Source: ${spinner_1.colors.muted('database (live)')}`);
         console.log(`  Output: ${spinner_1.colors.muted(options.output || '')}`);
     }
@@ -233,6 +248,7 @@ function normalizedToDbSchema(normalized) {
             cycle: s.cycle,
             ownedBy: s.ownedBy || undefined,
         })),
+        collations: [],
         extensions: normalized.extensions.map(e => e.name),
         functions: (normalized.functions || []).map(f => ({
             name: f.name,
@@ -280,7 +296,7 @@ async function exportChanges(projectRoot, flags, args, stagedOnly) {
         modeLabel = 'uncommitted';
     }
     if (changes.length === 0) {
-        console.log(`${spinner_1.colors.yellow('⚠')} No ${modeLabel} changes to export`);
+        (0, spinner_1.warning)(`No ${modeLabel} changes to export`);
         console.log('');
         if (stagedOnly) {
             console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq add .')} ${spinner_1.colors.muted('to stage changes.')}`);
@@ -309,7 +325,7 @@ async function exportChanges(projectRoot, flags, args, stagedOnly) {
         fs.mkdirSync(outputDir, { recursive: true });
     }
     fs.writeFileSync(absoluteOutputPath, sqlContent, 'utf-8');
-    console.log(`${spinner_1.colors.green('✓')} Exported ${changes.length} ${modeLabel} change(s) to ${outputPath}`);
+    console.log(`Exported ${changes.length} ${modeLabel} change(s) to ${outputPath}`);
     console.log(`${spinner_1.colors.muted(`${(sqlContent.length / 1024).toFixed(1)} KB`)}`);
     console.log('');
 }
@@ -330,4 +346,47 @@ function generateFullSQL(schema, options) {
         headerComment: header,
     });
 }
+function filterNormalizedSchema(schema, patterns, options) {
+    const filteredTables = schema.tables
+        .filter(table => !(0, relqignore_1.isTableIgnored)(table.name, patterns).ignored)
+        .map(table => ({
+        ...table,
+        columns: table.columns.filter(col => !(0, relqignore_1.isColumnIgnored)(table.name, col.name, patterns).ignored),
+        indexes: table.indexes.filter(idx => !(0, relqignore_1.isIndexIgnored)(table.name, idx.name, patterns).ignored),
+        constraints: table.constraints?.filter(con => !(0, relqignore_1.isConstraintIgnored)(table.name, con.name, patterns).ignored) || [],
+    }));
+    const filteredEnums = schema.enums.filter(e => !(0, relqignore_1.isEnumIgnored)(e.name, patterns).ignored);
+    const filteredDomains = schema.domains.filter(d => !(0, relqignore_1.isDomainIgnored)(d.name, patterns).ignored);
+    const filteredCompositeTypes = schema.compositeTypes.filter(c => !(0, relqignore_1.isCompositeTypeIgnored)(c.name, patterns).ignored);
+    const filteredSequences = schema.sequences.filter(s => !(0, relqignore_1.isSequenceIgnored)(s.name, patterns).ignored);
+    const filteredFunctions = options.includeFunctions
+        ? (schema.functions || []).filter(f => !(0, relqignore_1.isFunctionIgnored)(f.name, patterns).ignored)
+        : [];
+    const filteredTriggers = options.includeTriggers
+        ? schema.triggers || []
+        : [];
+    const filteredViews = options.includeViews
+        ? schema.views || []
+        : [];
+    const filteredMaterializedViews = options.includeViews
+        ? schema.materializedViews || []
+        : [];
+    const filteredForeignTables = options.includeFDW
+        ? schema.foreignTables || []
+        : [];
+    return {
+        extensions: schema.extensions,
+        enums: filteredEnums,
+        domains: filteredDomains,
+        compositeTypes: filteredCompositeTypes,
+        sequences: filteredSequences,
+        collations: schema.collations,
+        tables: filteredTables,
+        functions: filteredFunctions,
+        triggers: filteredTriggers,
+        views: filteredViews,
+        materializedViews: filteredMaterializedViews,
+        foreignTables: filteredForeignTables,
+    };
+}
 exports.default = exportCommand;

package/dist/cjs/cli/commands/fetch.cjs

@@ -3,33 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchCommand = fetchCommand;
 const config_loader_1 = require("../utils/config-loader.cjs");
 const env_loader_1 = require("../utils/env-loader.cjs");
-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");
 async function fetchCommand(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`);
     }
-    (0, config_loader_1.requireValidConfig)(config);
+    await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'fetch' });
     const connection = config.connection;
-    const projectRoot = process.cwd();
+    const { projectRoot } = context;
     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 spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     spinner.start(`Fetching from ${(0, env_loader_1.getConnectionDescription)(connection)}...`);
     try {
         await (0, repo_manager_1.ensureRemoteTable)(connection);
         const remoteCommits = await (0, repo_manager_1.fetchRemoteCommits)(connection, 100);
         if (remoteCommits.length === 0) {
             spinner.succeed('No remote commits found');
-            console.log('');
-            console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq push')} ${spinner_1.colors.muted('to push your commits.')}`);
+            (0, cli_utils_1.hint)("run 'relq push' to push your commits");
             return;
         }
         let newCommits = 0;
@@ -44,16 +39,45 @@ async function fetchCommand(context) {
         (0, repo_manager_1.setFetchHead)(latestRemote.hash, projectRoot);
         spinner.succeed(`Fetched ${remoteCommits.length} commits (${newCommits} new)`);
         const localHead = (0, repo_manager_1.getHead)(projectRoot);
-        if (localHead && latestRemote.hash !== localHead) {
-            console.log('');
-            console.log(`${spinner_1.colors.muted('From')} ${(0, env_loader_1.getConnectionDescription)(connection)}`);
-            console.log(`   ${(0, repo_manager_1.shortHash)(localHead)}..${(0, repo_manager_1.shortHash)(latestRemote.hash)}  ${spinner_1.colors.muted('main -> origin/main')}`);
+        const localCommits = localHead ? getAllLocalCommitHashes(projectRoot) : new Set();
+        const remoteHashes = new Set(remoteCommits.map(c => c.hash));
+        const behind = remoteCommits.filter(c => !localCommits.has(c.hash)).length;
+        const ahead = [...localCommits].filter(h => !remoteHashes.has(h)).length;
+        console.log('');
+        if (behind > 0 && ahead > 0) {
+            console.log(`Your branch and 'origin/main' have diverged,`);
+            console.log(`and have ${ahead} and ${behind} different commits each, respectively.`);
+        }
+        else if (behind > 0) {
+            console.log(`Your branch is behind 'origin/main' by ${behind} commit(s).`);
+            (0, cli_utils_1.hint)("run 'relq pull' to update your local branch");
+        }
+        else if (ahead > 0) {
+            console.log(`Your branch is ahead of 'origin/main' by ${ahead} commit(s).`);
+            (0, cli_utils_1.hint)("run 'relq push' to publish your local commits");
+        }
+        else {
+            console.log("Your branch is up to date with 'origin/main'.");
         }
     }
     catch (error) {
         spinner.fail('Fetch failed');
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Fetch failed', error instanceof Error ? error.message : String(error));
     }
     console.log('');
 }
+function getAllLocalCommitHashes(projectRoot) {
+    const fs = require('fs');
+    const path = require('path');
+    const commitsDir = path.join(projectRoot, '.relq', 'commits');
+    const hashes = new Set();
+    if (fs.existsSync(commitsDir)) {
+        const files = fs.readdirSync(commitsDir);
+        for (const file of files) {
+            if (file.endsWith('.json')) {
+                hashes.add(file.replace('.json', ''));
+            }
+        }
+    }
+    return hashes;
+}

package/dist/cjs/cli/commands/generate.cjs

@@ -44,32 +44,7 @@ const schema_diff_1 = require("../utils/schema-diff.cjs");
 const schema_hash_1 = require("../utils/schema-hash.cjs");
 const migration_generator_1 = require("../utils/migration-generator.cjs");
 const env_loader_1 = require("../utils/env-loader.cjs");
-const colors = {
-    reset: '\x1b[0m',
-    bold: '\x1b[1m',
-    dim: '\x1b[2m',
-    red: '\x1b[31m',
-    green: '\x1b[32m',
-    yellow: '\x1b[33m',
-    cyan: '\x1b[36m',
-};
-function askConfirm(question, defaultYes = false) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    const suffix = defaultYes ? '[Y/n]' : '[y/N]';
-    return new Promise((resolve) => {
-        rl.question(`${question} ${suffix}: `, (answer) => {
-            rl.close();
-            const a = answer.trim().toLowerCase();
-            if (!a)
-                resolve(defaultYes);
-            else
-                resolve(a === 'y' || a === 'yes');
-        });
-    });
-}
+const cli_utils_1 = require("../utils/cli-utils.cjs");
 function askInput(question) {
     const rl = readline.createInterface({
         input: process.stdin,
@@ -85,10 +60,10 @@ function askInput(question) {
 async function generateCommand(context) {
     const { config, args, 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: 'generate' });
     const connection = config.connection;
     const migrationsDir = config.migrations?.directory || './migrations';
     const snapshotPath = config.sync?.snapshot || '.relq/snapshot.json';
@@ -111,10 +86,10 @@ async function generateCommand(context) {
         migrationName = message.replace(/\s+/g, '_').toLowerCase();
     }
     if (!migrationName && !isEmpty) {
-        migrationName = await askInput(`${colors.cyan}Migration name:${colors.reset} `);
+        migrationName = await askInput('Migration name: ');
         if (!migrationName) {
-            console.error('Error: Migration name is required.');
-            process.exit(1);
+            (0, cli_utils_1.fatal)('Migration name is required');
+            return;
         }
     }
     if (isEmpty) {
@@ -122,48 +97,48 @@ async function generateCommand(context) {
         await createEmptyMigration(migrationsDir, migrationName, format, dryRun);
         return;
     }
-    console.log(`${colors.bold}Generating migration...${colors.reset}`);
+    console.log('Generating migration...');
     console.log(`   Connection: ${(0, env_loader_1.getConnectionDescription)(connection)}`);
     console.log('');
     try {
         const dbSchema = await (0, schema_introspect_1.introspectDatabase)(connection);
         const snapshot = (0, snapshot_manager_1.loadSnapshot)(snapshotPath);
         if (!snapshot) {
-            console.log(`${colors.yellow}No snapshot found.${colors.reset}`);
-            console.log(`Run "${colors.cyan}relq pull${colors.reset}" first to create initial snapshot.`);
+            (0, cli_utils_1.warning)('No snapshot found.');
+            console.log('Run "relq pull" first to create initial snapshot.');
             return;
         }
         const localSchema = (0, snapshot_manager_1.snapshotToDatabaseSchema)(snapshot);
         const diff = (0, schema_diff_1.diffSchemas)((0, schema_hash_1.normalizeSchema)(localSchema), (0, schema_hash_1.normalizeSchema)(dbSchema));
         const filteredDiff = (0, schema_diff_1.filterDiff)(diff, ignorePatterns);
         if (!filteredDiff.hasChanges) {
-            console.log(`${colors.green}No changes to generate.${colors.reset}`);
+            console.log('No changes to generate.');
             return;
         }
         const s = filteredDiff.summary;
-        console.log(`${colors.bold}Changes to include:${colors.reset}`);
+        console.log('Changes to include:');
         if (s.tablesAdded > 0)
-            console.log(`  ${colors.green}+ ${s.tablesAdded} table(s)${colors.reset}`);
+            console.log(`  + ${s.tablesAdded} table(s)`);
         if (s.tablesRemoved > 0)
-            console.log(`  ${colors.red}- ${s.tablesRemoved} table(s)${colors.reset}`);
+            console.log(`  - ${s.tablesRemoved} table(s)`);
         if (s.tablesModified > 0)
-            console.log(`  ${colors.yellow}~ ${s.tablesModified} table(s) modified${colors.reset}`);
+            console.log(`  ~ ${s.tablesModified} table(s) modified`);
         if (s.columnsAdded > 0)
-            console.log(`  ${colors.green}+ ${s.columnsAdded} column(s)${colors.reset}`);
+            console.log(`  + ${s.columnsAdded} column(s)`);
         if (s.columnsRemoved > 0)
-            console.log(`  ${colors.red}- ${s.columnsRemoved} column(s)${colors.reset}`);
+            console.log(`  - ${s.columnsRemoved} column(s)`);
         if (s.columnsModified > 0)
-            console.log(`  ${colors.yellow}~ ${s.columnsModified} column(s)${colors.reset}`);
+            console.log(`  ~ ${s.columnsModified} column(s)`);
         console.log('');
         if ((0, schema_diff_1.hasDestructiveChanges)(filteredDiff)) {
             const tables = (0, schema_diff_1.getDestructiveTables)(filteredDiff);
-            console.log(`${colors.red}${colors.bold}⚠️  Destructive changes:${colors.reset}`);
+            (0, cli_utils_1.warning)('Destructive changes:');
             for (const t of tables) {
-                console.log(`   ${colors.red}• ${t}${colors.reset}`);
+                console.log(`   - ${t}`);
             }
             console.log('');
             if (!autoStage) {
-                const proceed = await askConfirm('Include destructive changes?', false);
+                const proceed = await (0, cli_utils_1.confirm)('Include destructive changes?', false);
                 if (!proceed) {
                     console.log('Cancelled.');
                     return;
@@ -185,7 +160,7 @@ async function generateCommand(context) {
         }
         const filePath = path.join(migrationsDir, fileName);
         if (dryRun) {
-            console.log(`${colors.cyan}[dry-run] Would create: ${filePath}${colors.reset}`);
+            console.log(`[dry-run] Would create: ${filePath}`);
             console.log('');
             console.log('--- Generated SQL ---');
             console.log(migrationFile.content);
@@ -196,16 +171,15 @@ async function generateCommand(context) {
                 fs.mkdirSync(migrationsDir, { recursive: true });
             }
             fs.writeFileSync(filePath, migrationFile.content, 'utf-8');
-            console.log(`${colors.green}✓ Created:${colors.reset} ${filePath}`);
+            console.log(`Created: ${filePath}`);
             (0, snapshot_manager_1.saveSnapshot)(dbSchema, snapshotPath, connection.database);
-            console.log(`${colors.dim}Updated snapshot.${colors.reset}`);
+            console.log('Updated snapshot.');
         }
         console.log('');
-        console.log(`${colors.dim}Run "relq push" to apply this migration.${colors.reset}`);
+        console.log('Run "relq push" to apply this migration.');
     }
     catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : error);
-        process.exit(1);
+        (0, cli_utils_1.fatal)('Generation failed', error instanceof Error ? error.message : String(error));
     }
 }
 async function createEmptyMigration(migrationsDir, name, format, dryRun) {
@@ -230,13 +204,13 @@ async function createEmptyMigration(migrationsDir, name, format, dryRun) {
 
 `;
     if (dryRun) {
-        console.log(`${colors.cyan}[dry-run] Would create: ${filePath}${colors.reset}`);
+        console.log(`[dry-run] Would create: ${filePath}`);
     }
     else {
         if (!fs.existsSync(migrationsDir)) {
             fs.mkdirSync(migrationsDir, { recursive: true });
         }
         fs.writeFileSync(filePath, content, 'utf-8');
-        console.log(`${colors.green}✓ Created empty migration:${colors.reset} ${filePath}`);
+        console.log(`Created empty migration: ${filePath}`);
     }
 }