relq 1.0.0 → 1.0.2

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

@@ -2,83 +2,162 @@
 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 spinner_1 = require("../utils/spinner.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 } = context;
+    const projectRoot = process.cwd();
+    console.log('');
+    if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
+        console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
+        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq init')} ${spinner_1.colors.muted('to initialize.')}`);
+        return;
     }
-    (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) {
+            console.error('Error: No configuration found.');
+            process.exit(1);
         }
-        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;
+        (0, config_loader_1.requireValidConfig)(config);
+        await showOriginDiff(config, projectRoot, showSQL);
+        return;
+    }
+    await showUnstagedDiff(projectRoot, showSQL);
+}
+function getSymbol(change) {
+    if (change.type === 'CREATE')
+        return spinner_1.colors.green('+');
+    if (change.type === 'DROP')
+        return spinner_1.colors.red('-');
+    return spinner_1.colors.yellow('~');
+}
+async function showUnstagedDiff(projectRoot, showSQL) {
+    const unstaged = (0, repo_manager_1.getUnstagedChanges)(projectRoot);
+    if (unstaged.length === 0) {
+        console.log(`${spinner_1.colors.green('No unstaged changes.')}`);
+        console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq diff remote/live')} ${spinner_1.colors.muted('to compare with remote.')}`);
+        console.log('');
+        return;
+    }
+    console.log(`${spinner_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(`${spinner_1.colors.bold('SQL:')}`);
+        for (const change of sorted) {
+            const sql = (0, change_tracker_1.generateChangeSQL)(change);
+            if (sql)
+                console.log(`${spinner_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(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq add .')} ${spinner_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(`${spinner_1.colors.green('No staged changes.')}`);
+        console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq add .')} ${spinner_1.colors.muted('to stage changes.')}`);
+        console.log('');
+        return;
+    }
+    console.log(`${spinner_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(`${spinner_1.colors.bold('SQL:')}`);
+        for (const change of sorted) {
+            const sql = (0, change_tracker_1.generateChangeSQL)(change);
+            if (sql)
+                console.log(`${spinner_1.colors.cyan(sql)}`);
         }
+    }
+    console.log('');
+    console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq commit -m "message"')} ${spinner_1.colors.muted('to commit.')}`);
+    console.log('');
+}
+async function showOriginDiff(config, projectRoot, showSQL) {
+    const connection = config.connection;
+    const spinner = (0, spinner_1.createSpinner)();
+    const snapshot = (0, repo_manager_1.loadSnapshot)(projectRoot);
+    if (!snapshot) {
+        console.log(`${spinner_1.colors.yellow('No local snapshot.')}`);
+        console.log(`${spinner_1.colors.muted('Run')} ${spinner_1.colors.cyan('relq pull')} ${spinner_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(`${spinner_1.colors.green('✓ 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(`${spinner_1.colors.bold('Differences:')}`);
+    console.log('');
+    for (const d of diffs.slice(0, 20)) {
+        const sym = d.type === 'added' ? spinner_1.colors.green('+') : d.type === 'removed' ? spinner_1.colors.red('-') : spinner_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(`   ${spinner_1.colors.muted(`... and ${diffs.length - 20} more`)}`);
+    }
+    console.log('');
+    console.log(`${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq pull')} ${spinner_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,6 +41,8 @@ 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;
@@ -82,7 +84,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 +104,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);
@@ -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

@@ -44,10 +44,25 @@ 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(`  ${spinner_1.colors.yellow(String(ahead))} commit(s) ahead, ${spinner_1.colors.yellow(String(behind))} commit(s) behind`);
+        }
+        else if (behind > 0) {
+            console.log(`Your branch is ${spinner_1.colors.yellow(String(behind))} commit(s) behind 'origin/main'.`);
+            console.log(`  ${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq pull')} ${spinner_1.colors.muted('to update.')}`);
+        }
+        else if (ahead > 0) {
+            console.log(`Your branch is ${spinner_1.colors.green(String(ahead))} commit(s) ahead of 'origin/main'.`);
+            console.log(`  ${spinner_1.colors.muted('Use')} ${spinner_1.colors.cyan('relq push')} ${spinner_1.colors.muted('to publish.')}`);
+        }
+        else {
+            console.log(`${spinner_1.colors.green('✓')} Your branch is up to date with 'origin/main'.`);
         }
     }
     catch (error) {
@@ -57,3 +72,18 @@ async function fetchCommand(context) {
     }
     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/history.cjs

@@ -123,7 +123,7 @@ function getMigrationFiles(migrationsDir) {
         .sort();
 }
 async function getAppliedMigrations(connection, tableName) {
-    const { Pool } = await Promise.resolve().then(() => __importStar(require("../../../addons/pg.js")));
+    const { Pool } = await Promise.resolve().then(() => __importStar(require("../../addon/pg/index.cjs")));
     const pool = new Pool({
         host: connection.host,
         port: connection.port || 5432,