relq 1.0.2 → 1.0.4

package/dist/cjs/cli/commands/status.cjs

@@ -41,16 +41,11 @@ const spinner_1 = require("../utils/spinner.cjs");
 const relqignore_1 = require("../utils/relqignore.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 async function statusCommand(context) {
-    const { config, flags } = context;
-    const projectRoot = process.cwd();
+    const { config, flags, projectRoot } = context;
     const connection = config?.connection;
     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.')}`);
-        console.log('');
-        return;
+        (0, spinner_1.fatal)('not a relq repository (or any parent directories): .relq', `Run ${spinner_1.colors.cyan('relq init')} to initialize.`);
     }
     const head = (0, repo_manager_1.getHead)(projectRoot);
     const staged = (0, repo_manager_1.getStagedChanges)(projectRoot);
@@ -73,7 +68,7 @@ async function statusCommand(context) {
         console.log(`${spinner_1.colors.green('Changes to be committed:')}`);
         console.log(`  ${spinner_1.colors.muted('(use "relq restore --staged <name>..." to unstage)')}`);
         console.log('');
-        displayChanges(staged, '	');
+        displayChanges(staged, '        ');
         console.log('');
     }
     if (unstaged.length > 0) {
@@ -81,7 +76,7 @@ async function statusCommand(context) {
         console.log(`  ${spinner_1.colors.muted('(use "relq add <name>..." to stage)')}`);
         console.log(`  ${spinner_1.colors.muted('(use "relq restore <name>..." to discard)')}`);
         console.log('');
-        displayChanges(unstaged, '	');
+        displayChanges(unstaged, '      ');
         console.log('');
     }
     const ignorePatterns = (0, relqignore_1.loadRelqignore)(projectRoot);
@@ -92,7 +87,7 @@ async function statusCommand(context) {
             !p.raw.startsWith('_temp_') &&
             !p.raw.startsWith('tmp_'));
         if (userPatterns.length > 0) {
-            console.log(`${spinner_1.colors.muted(`ℹ ${userPatterns.length} pattern(s) active from .relqignore`)}`);
+            console.log(`${spinner_1.colors.muted(`${userPatterns.length} pattern(s) active from .relqignore`)}`);
             console.log('');
         }
     }

package/dist/cjs/cli/commands/sync.cjs

@@ -3,77 +3,57 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncCommand = syncCommand;
 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");
 const pull_1 = require("./pull.cjs");
 async function syncCommand(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 one.`);
     }
-    (0, config_loader_1.requireValidConfig)(config);
+    await (0, config_loader_1.requireValidConfig)(config, { calledFrom: 'sync' });
     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 ${cli_utils_1.colors.cyan('relq init')} to initialize.`);
     }
-    const spinner = (0, spinner_1.createSpinner)();
+    const spinner = (0, cli_utils_1.createSpinner)();
     try {
-        spinner.start('Checking sync status...');
-        const status = await (0, repo_manager_1.getRepoStatus)(connection, projectRoot);
-        spinner.stop();
-        console.log(`On database: ${spinner_1.colors.cyan((0, env_loader_1.getConnectionDescription)(connection))}`);
+        console.log(`Syncing with ${cli_utils_1.colors.cyan((0, env_loader_1.getConnectionDescription)(connection))}...`);
         console.log('');
-        if (status.behindBy > 0) {
-            console.log(`${spinner_1.colors.yellow('↓')} ${status.behindBy} commit(s) to pull`);
-        }
-        if (status.aheadBy > 0) {
-            console.log(`${spinner_1.colors.green('↑')} ${status.aheadBy} commit(s) to push`);
-        }
-        if (status.behindBy === 0 && status.aheadBy === 0) {
-            console.log(`${spinner_1.colors.green('✓')} Already in sync`);
+        await (0, pull_1.pullCommand)(context);
+        await (0, repo_manager_1.ensureRemoteTable)(connection);
+        const remoteCommits = await (0, repo_manager_1.fetchRemoteCommits)(connection, 100);
+        const remoteHashes = new Set(remoteCommits.map(c => c.hash));
+        const localCommitsAfter = (0, repo_manager_1.getAllCommits)(projectRoot);
+        const toPush = localCommitsAfter.filter(c => !remoteHashes.has(c.hash));
+        if (toPush.length === 0) {
+            (0, cli_utils_1.success)('Sync complete - up to date');
             console.log('');
             return;
         }
+        console.log(`Pushing ${toPush.length} local commit(s)...`);
         console.log('');
-        if (status.behindBy > 0) {
-            console.log(`${spinner_1.colors.cyan('●')} Pulling changes...`);
-            console.log('');
-            const pullContext = {
-                ...context,
-                flags: { ...flags, force: true },
-            };
-            await (0, pull_1.pullCommand)(pullContext);
+        spinner.start(`Pushing ${toPush.length} commit(s)...`);
+        for (const commit of toPush.reverse()) {
+            await (0, repo_manager_1.pushCommit)(connection, commit);
         }
-        if (status.aheadBy > 0) {
-            console.log(`${spinner_1.colors.cyan('●')} Pushing commits...`);
-            console.log('');
-            await (0, repo_manager_1.ensureRemoteTable)(connection);
-            const localCommits = (0, repo_manager_1.getAllCommits)(projectRoot);
-            const remoteCommits = await (0, repo_manager_1.fetchRemoteCommits)(connection, 100);
-            const remoteHashes = new Set(remoteCommits.map(c => c.hash));
-            const toPush = localCommits.filter(c => !remoteHashes.has(c.hash));
-            spinner.start(`Pushing ${toPush.length} commit(s)...`);
-            for (const commit of toPush.reverse()) {
-                await (0, repo_manager_1.pushCommit)(connection, commit);
-            }
-            spinner.succeed(`Pushed ${toPush.length} commit(s)`);
+        spinner.succeed(`Pushed ${toPush.length} commit(s)`);
+        console.log('');
+        console.log('Pushed commits:');
+        for (const commit of toPush.slice(0, 5)) {
+            console.log(`  ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(commit.hash))} ${commit.message}`);
+        }
+        if (toPush.length > 5) {
+            console.log(`  ${cli_utils_1.colors.muted(`... and ${toPush.length - 5} more`)}`);
         }
         console.log('');
-        const pulledText = status.behindBy > 0 ? `${spinner_1.colors.yellow(`↓ ${status.behindBy}`)} pulled` : '';
-        const pushedText = status.aheadBy > 0 ? `${spinner_1.colors.green(`↑ ${status.aheadBy}`)} pushed` : '';
-        const separator = pulledText && pushedText ? ' | ' : '';
-        console.log(`${spinner_1.colors.green('✓')} Sync complete: ${pulledText}${separator}${pushedText}`);
+        (0, cli_utils_1.success)(`Sync complete - pushed ${toPush.length} commit(s)`);
     }
-    catch (error) {
+    catch (err) {
         spinner.fail('Sync failed');
-        console.error(spinner_1.colors.red(`Error: ${error instanceof Error ? error.message : error}`));
-        process.exit(1);
+        (0, cli_utils_1.fatal)(err instanceof Error ? err.message : String(err));
     }
     console.log('');
 }

package/dist/cjs/cli/commands/tag.cjs

@@ -50,8 +50,7 @@ function saveTags(tags, projectRoot) {
     fs.writeFileSync(tagPath, JSON.stringify(tags, null, 2));
 }
 async function tagCommand(context) {
-    const { args, flags } = context;
-    const projectRoot = process.cwd();
+    const { args, flags, projectRoot } = context;
     console.log('');
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
         console.log(`${spinner_1.colors.red('fatal:')} not a relq repository`);
@@ -75,7 +74,7 @@ async function tagCommand(context) {
         }
         delete tags[tagName];
         saveTags(tags, projectRoot);
-        console.log(`${spinner_1.colors.green('✓')} Deleted tag '${tagName}'`);
+        console.log(`Deleted tag '${tagName}'`);
         console.log('');
         return;
     }
@@ -123,7 +122,7 @@ async function tagCommand(context) {
             createdAt: new Date().toISOString(),
         };
         saveTags(tags, projectRoot);
-        console.log(`${spinner_1.colors.green('✓')} Tagged ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(hash))} as '${spinner_1.colors.cyan(tagName)}'`);
+        console.log(`Tagged ${spinner_1.colors.yellow((0, repo_manager_1.shortHash)(hash))} as '${tagName}'`);
         console.log(`    ${commit.message}`);
         console.log('');
         return;

package/dist/cjs/cli/index.cjs

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -34,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = main;
 const init_1 = require("./commands/init.cjs");
 const pull_1 = require("./commands/pull.cjs");
 const push_1 = require("./commands/push.cjs");
@@ -57,6 +57,34 @@ const merge_1 = require("./commands/merge.cjs");
 const tag_1 = require("./commands/tag.cjs");
 const cherry_pick_1 = require("./commands/cherry-pick.cjs");
 const remote_1 = require("./commands/remote.cjs");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+function loadEnvFile() {
+    let currentDir = process.cwd();
+    const root = path.parse(currentDir).root;
+    while (currentDir !== root) {
+        const envPath = path.join(currentDir, '.env');
+        if (fs.existsSync(envPath)) {
+            const envContent = fs.readFileSync(envPath, 'utf-8');
+            for (const line of envContent.split('\n')) {
+                const trimmed = line.trim();
+                if (!trimmed || trimmed.startsWith('#'))
+                    continue;
+                const match = trimmed.match(/^([^=]+)=(.*)$/);
+                if (match) {
+                    const key = match[1].trim();
+                    const value = match[2].trim().replace(/^["']|["']$/g, '');
+                    if (!process.env[key]) {
+                        process.env[key] = value;
+                    }
+                }
+            }
+            return;
+        }
+        currentDir = path.dirname(currentDir);
+    }
+}
+loadEnvFile();
 const VERSION = '1.1.0';
 function parseArgs(argv) {
     const args = [];
@@ -184,20 +212,56 @@ async function main() {
         process.exit(1);
     }
     let config = null;
+    let resolvedProjectRoot = process.cwd();
     if (requiresConfig(command)) {
         const configPath = flags.config;
         try {
             const { loadConfigWithEnv, findConfigFileRecursive } = await Promise.resolve().then(() => __importStar(require("./utils/config-loader.cjs")));
-            const foundConfig = configPath ? configPath : findConfigFileRecursive()?.path;
+            const { findProjectRoot } = await Promise.resolve().then(() => __importStar(require("./utils/project-root.cjs")));
+            const configResult = configPath ? { path: configPath, directory: path.dirname(path.resolve(configPath)) } : findConfigFileRecursive();
+            if (!configResult) {
+                const projectRoot = findProjectRoot();
+                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);
+                }
+            }
+            resolvedProjectRoot = configResult?.directory || findProjectRoot() || process.cwd();
+            const foundConfig = configResult?.path;
             if (!foundConfig) {
-                console.error('Error: relq.config.ts not found.');
-                console.error('Run "relq init" to create one or use --config to specify a path.');
+                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('error:') + ' relq.config.ts not found');
+                console.error('');
+                console.error(colors.yellow('hint:') + ` Run ${colors.cyan('relq init')} to create one or use ${colors.cyan('--config')} to specify a path.`);
+                console.error('');
                 process.exit(1);
             }
             config = await loadConfigWithEnv(configPath);
             if (requiresDbConnection(command, flags) && !config.connection?.host && !config.connection?.url) {
-                console.error('Error: No database connection configured.');
-                console.error('Run "relq init" or set DATABASE_* environment variables.');
+                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('error:') + ' No database connection configured');
+                console.error('');
+                console.error(colors.yellow('hint:') + ` Run ${colors.cyan('relq init')} or set DATABASE_* environment variables.`);
+                console.error('');
                 process.exit(1);
             }
         }
@@ -206,7 +270,7 @@ async function main() {
             process.exit(1);
         }
     }
-    const context = { config, args, flags };
+    const context = { config, args, flags, projectRoot: resolvedProjectRoot };
     try {
         switch (command) {
             case 'init':
@@ -296,7 +360,7 @@ async function main() {
                     theirs: Boolean(flags.theirs),
                     ours: Boolean(flags.ours),
                     abort: Boolean(flags.abort),
-                });
+                }, resolvedProjectRoot);
                 break;
             case 'export':
                 await (0, export_1.exportCommand)(context);
@@ -316,4 +380,3 @@ async function main() {
         process.exit(1);
     }
 }
-main().catch(console.error);

package/dist/cjs/cli/utils/change-tracker.cjs

@@ -72,6 +72,12 @@ function generateChangeSQL(change) {
             return generateConstraintSQL(change);
         case 'PARTITION':
             return generatePartitionSQL(change);
+        case 'PARTITION_CHILD':
+            return generatePartitionChildSQL(change);
+        case 'TABLE_COMMENT':
+            return generateTableCommentSQL(change);
+        case 'COLUMN_COMMENT':
+            return generateColumnCommentSQL(change);
         case 'VIEW':
             return generateViewSQL(change);
         case 'MATERIALIZED_VIEW':
@@ -85,6 +91,8 @@ function generateChangeSQL(change) {
             return generateForeignServerSQL(change);
         case 'FOREIGN_TABLE':
             return generateForeignTableSQL(change);
+        case 'COLLATION':
+            return generateCollationSQL(change);
         default:
             return `-- Unsupported object type: ${change.objectType}`;
     }
@@ -185,8 +193,11 @@ function generateTableSQL(change) {
         }
         const allDefs = [...colDefs, ...constraintDefs].join(',\n');
         let sql = `CREATE TABLE "${data.name}" (\n${allDefs}\n)`;
-        if (data.isPartitioned && data.partitionType && data.partitionKey?.length) {
-            sql += ` PARTITION BY ${data.partitionType} (${data.partitionKey.join(', ')})`;
+        if (data.isPartitioned && data.partitionType && data.partitionKey) {
+            const keyArr = Array.isArray(data.partitionKey) ? data.partitionKey : [data.partitionKey];
+            if (keyArr.length) {
+                sql += ` PARTITION BY ${data.partitionType} (${keyArr.join(', ')})`;
+            }
         }
         return sql + ';';
     }
@@ -267,6 +278,9 @@ function generateConstraintSQL(change) {
     return '';
 }
 function generatePartitionSQL(change) {
+    return '';
+}
+function generatePartitionChildSQL(change) {
     const data = change.after;
     if (change.type === 'CREATE' && data) {
         return `CREATE TABLE "${data.name}" PARTITION OF "${data.parentTable}" ${data.bound};`;
@@ -276,6 +290,33 @@ function generatePartitionSQL(change) {
     }
     return '';
 }
+function generateTableCommentSQL(change) {
+    const data = change.after;
+    if ((change.type === 'CREATE' || change.type === 'ALTER') && data) {
+        const escaped = data.comment.replace(/'/g, "''");
+        return `COMMENT ON TABLE "${data.tableName}" IS '${escaped}';`;
+    }
+    else if (change.type === 'DROP') {
+        const beforeData = change.before;
+        const tableName = beforeData?.tableName || change.objectName;
+        return `COMMENT ON TABLE "${tableName}" IS NULL;`;
+    }
+    return '';
+}
+function generateColumnCommentSQL(change) {
+    const data = change.after;
+    if ((change.type === 'CREATE' || change.type === 'ALTER') && data) {
+        const escaped = data.comment.replace(/'/g, "''");
+        return `COMMENT ON COLUMN "${data.tableName}"."${data.columnName}" IS '${escaped}';`;
+    }
+    else if (change.type === 'DROP') {
+        const beforeData = change.before;
+        const tableName = beforeData?.tableName || change.parentName || '';
+        const columnName = beforeData?.columnName || change.objectName;
+        return `COMMENT ON COLUMN "${tableName}"."${columnName}" IS NULL;`;
+    }
+    return '';
+}
 function generateViewSQL(change) {
     const data = change.after;
     if (change.type === 'CREATE' && data) {
@@ -361,6 +402,28 @@ function generateForeignTableSQL(change) {
     }
     return '';
 }
+function generateCollationSQL(change) {
+    const data = change.after;
+    if (change.type === 'CREATE' && data) {
+        const options = [];
+        if (data.locale)
+            options.push(`LOCALE = '${data.locale}'`);
+        if (data.lcCollate)
+            options.push(`LC_COLLATE = '${data.lcCollate}'`);
+        if (data.lcCtype)
+            options.push(`LC_CTYPE = '${data.lcCtype}'`);
+        if (data.provider)
+            options.push(`PROVIDER = ${data.provider}`);
+        if (data.deterministic !== undefined) {
+            options.push(`DETERMINISTIC = ${data.deterministic ? 'TRUE' : 'FALSE'}`);
+        }
+        return `CREATE COLLATION IF NOT EXISTS "${data.name}" (${options.join(', ')});`;
+    }
+    else if (change.type === 'DROP') {
+        return `DROP COLLATION IF EXISTS "${change.objectName}";`;
+    }
+    return '';
+}
 function createChange(type, objectType, objectName, before, after, parentName) {
     const id = generateChangeId(type, objectType, objectName, parentName);
     const change = {
@@ -382,6 +445,42 @@ function getChangeDisplayName(change) {
         change.type === 'DROP' ? '-' :
             change.type === 'ALTER' ? '~' :
                 '>';
+    if (change.objectType === 'INDEX') {
+        const data = change.after;
+        const tableName = data?.tableName || change.parentName;
+        if (tableName) {
+            return `${prefix} ${change.objectType} ${change.objectName} on ${tableName}`;
+        }
+    }
+    if (change.objectType === 'PARTITION') {
+        const data = change.after;
+        if (data?.tableName && data?.type && data?.key) {
+            let keyStr = Array.isArray(data.key) ? data.key.join(', ') : data.key;
+            keyStr = keyStr.replace(/[{}]/g, '');
+            return `${prefix} PARTITIONED ${data.tableName} by ${data.type.toUpperCase()}(${keyStr})`;
+        }
+    }
+    if (change.objectType === 'PARTITION_CHILD') {
+        const data = change.after;
+        if (data?.name && data?.parentTable) {
+            const bound = data.bound || '';
+            return `${prefix} PARTITION ${data.name} of ${data.parentTable} ${bound}`;
+        }
+    }
+    if (change.objectType === 'CHECK') {
+        const actionWord = change.type === 'CREATE' ? 'ADD' : change.type === 'DROP' ? 'DROP' : 'ALTER';
+        if (change.parentName) {
+            return `${prefix} ${actionWord} CHECK ${change.objectName} on ${change.parentName}`;
+        }
+        return `${prefix} ${actionWord} CHECK ${change.objectName}`;
+    }
+    if (change.objectType === 'PRIMARY_KEY' || change.objectType === 'FOREIGN_KEY' || change.objectType === 'EXCLUSION') {
+        const actionWord = change.type === 'CREATE' ? 'ADD' : change.type === 'DROP' ? 'DROP' : 'ALTER';
+        if (change.parentName) {
+            return `${prefix} ${actionWord} ${change.objectType.replace('_', ' ')} ${change.objectName} on ${change.parentName}`;
+        }
+        return `${prefix} ${actionWord} ${change.objectType.replace('_', ' ')} ${change.objectName}`;
+    }
     if (change.parentName) {
         return `${prefix} ${change.objectType} ${change.parentName}.${change.objectName}`;
     }
@@ -391,14 +490,18 @@ function sortChangesByDependency(changes) {
     const order = {
         'EXTENSION': 1,
         'SCHEMA': 2,
+        'SCHEMA_FILE': 0,
         'ENUM': 3,
         'DOMAIN': 4,
         'COMPOSITE_TYPE': 5,
         'SEQUENCE': 6,
         'FOREIGN_SERVER': 7,
         'TABLE': 10,
+        'TABLE_COMMENT': 10,
         'PARTITION': 11,
-        'COLUMN': 12,
+        'PARTITION_CHILD': 12,
+        'COLUMN': 13,
+        'COLUMN_COMMENT': 12,
         'INDEX': 13,
         'CONSTRAINT': 14,
         'PRIMARY_KEY': 14,
@@ -411,6 +514,7 @@ function sortChangesByDependency(changes) {
         'PROCEDURE': 31,
         'TRIGGER': 40,
         'ENUM_VALUE': 3,
+        'COLLATION': 4,
         'FOREIGN_TABLE': 8,
     };
     return [...changes].sort((a, b) => {