relq 1.0.1 → 1.0.2

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

@@ -0,0 +1,147 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tagCommand = tagCommand;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const spinner_1 = require("../utils/spinner.cjs");
+const repo_manager_1 = require("../utils/repo-manager.cjs");
+function loadTags(projectRoot) {
+    const tagPath = path.join(projectRoot, '.relq', 'tags.json');
+    if (fs.existsSync(tagPath)) {
+        return JSON.parse(fs.readFileSync(tagPath, 'utf-8'));
+    }
+    return {};
+}
+function saveTags(tags, projectRoot) {
+    const tagPath = path.join(projectRoot, '.relq', 'tags.json');
+    fs.writeFileSync(tagPath, JSON.stringify(tags, null, 2));
+}
+async function tagCommand(context) {
+    const { 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`);
+        return;
+    }
+    const tags = loadTags(projectRoot);
+    const deleteFlag = flags['d'] === true || flags['delete'] === true;
+    const force = flags['f'] === true || flags['force'] === true;
+    if (deleteFlag) {
+        const tagName = args[0];
+        if (!tagName) {
+            console.log(`${spinner_1.colors.red('error:')} Please specify tag name`);
+            console.log('');
+            console.log(`Usage: ${spinner_1.colors.cyan('relq tag -d <name>')}`);
+            console.log('');
+            return;
+        }
+        if (!tags[tagName]) {
+            console.log(`${spinner_1.colors.red('error:')} Tag not found: ${tagName}`);
+            return;
+        }
+        delete tags[tagName];
+        saveTags(tags, projectRoot);
+        console.log(`${spinner_1.colors.green('✓')} Deleted tag '${tagName}'`);
+        console.log('');
+        return;
+    }
+    if (args[0]) {
+        const tagName = args[0];
+        const targetHash = args[1];
+        if (!/^[a-zA-Z0-9._-]+$/.test(tagName)) {
+            console.log(`${spinner_1.colors.red('error:')} Invalid tag name`);
+            console.log('Tag names can only contain: letters, numbers, dots, dashes, underscores');
+            console.log('');
+            return;
+        }
+        if (tags[tagName] && !force) {
+            console.log(`${spinner_1.colors.red('error:')} Tag already exists: ${tagName}`);
+            console.log('');
+            console.log(`Use ${spinner_1.colors.cyan(`relq tag -f ${tagName}`)} to overwrite`);
+            console.log('');
+            return;
+        }
+        let hash;
+        if (targetHash) {
+            const commit = (0, repo_manager_1.loadCommit)(targetHash, projectRoot);
+            if (!commit) {
+                console.log(`${spinner_1.colors.red('error:')} Commit not found: ${targetHash}`);
+                return;
+            }
+            hash = commit.hash;
+        }
+        else {
+            const head = (0, repo_manager_1.getHead)(projectRoot);
+            if (!head) {
+                console.log(`${spinner_1.colors.red('error:')} No commits yet`);
+                return;
+            }
+            hash = head;
+        }
+        const commit = (0, repo_manager_1.loadCommit)(hash, projectRoot);
+        if (!commit) {
+            console.log(`${spinner_1.colors.red('error:')} Cannot load commit`);
+            return;
+        }
+        tags[tagName] = {
+            hash,
+            message: commit.message,
+            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(`    ${commit.message}`);
+        console.log('');
+        return;
+    }
+    const tagNames = Object.keys(tags).sort();
+    if (tagNames.length === 0) {
+        console.log(`${spinner_1.colors.muted('No tags.')}`);
+        console.log('');
+        console.log(`Create one with: ${spinner_1.colors.cyan('relq tag <name>')}`);
+        console.log('');
+        return;
+    }
+    for (const name of tagNames) {
+        const tag = tags[name];
+        const hash = spinner_1.colors.yellow((0, repo_manager_1.shortHash)(tag.hash));
+        const tagName = spinner_1.colors.cyan(name);
+        console.log(`${tagName.padEnd(20)} ${hash}  ${tag.message}`);
+    }
+    console.log('');
+}
+exports.default = tagCommand;

package/dist/cjs/cli/index.cjs

@@ -49,6 +49,14 @@ const fetch_1 = require("./commands/fetch.cjs");
 const add_1 = require("./commands/add.cjs");
 const import_1 = require("./commands/import.cjs");
 const export_1 = require("./commands/export.cjs");
+const resolve_1 = require("./commands/resolve.cjs");
+const reset_1 = require("./commands/reset.cjs");
+const stash_1 = require("./commands/stash.cjs");
+const branch_1 = require("./commands/branch.cjs");
+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 VERSION = '1.1.0';
 function parseArgs(argv) {
     const args = [];
@@ -179,8 +187,8 @@ async function main() {
     if (requiresConfig(command)) {
         const configPath = flags.config;
         try {
-            const { loadConfigWithEnv, findConfigFile } = await Promise.resolve().then(() => __importStar(require("./utils/config-loader.cjs")));
-            const foundConfig = configPath || findConfigFile();
+            const { loadConfigWithEnv, findConfigFileRecursive } = await Promise.resolve().then(() => __importStar(require("./utils/config-loader.cjs")));
+            const foundConfig = configPath ? configPath : findConfigFileRecursive()?.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.');
@@ -229,6 +237,9 @@ async function main() {
             case 'log':
                 await (0, log_1.logCommand)(context);
                 break;
+            case 'show':
+                await (0, log_1.showCommand)(context);
+                break;
             case 'fetch':
                 await (0, fetch_1.fetchCommand)(context);
                 break;
@@ -236,6 +247,39 @@ async function main() {
             case 'revert':
                 await (0, rollback_1.rollbackCommand)(context);
                 break;
+            case 'resolve':
+                await (0, resolve_1.resolveCommand)(context);
+                break;
+            case 'reset':
+                await (0, reset_1.resetCommand)(context);
+                break;
+            case 'stash':
+                await (0, stash_1.stashCommand)(context);
+                break;
+            case 'branch':
+                await (0, branch_1.branchCommand)(context);
+                break;
+            case 'checkout':
+            case 'switch':
+                console.log('');
+                console.log('⚠️  Branch switching is currently disabled.');
+                console.log('');
+                console.log('This feature will be available when Relq Postgres Native is officially launched.');
+                console.log('For now, work on a single branch and use merge to combine schemas.');
+                console.log('');
+                break;
+            case 'merge':
+                await (0, merge_1.mergeCommand)(context);
+                break;
+            case 'tag':
+                await (0, tag_1.tagCommand)(context);
+                break;
+            case 'cherry-pick':
+                await (0, cherry_pick_1.cherryPickCommand)(context);
+                break;
+            case 'remote':
+                await (0, remote_1.remoteCommand)(context);
+                break;
             case 'introspect':
                 await (0, introspect_1.introspectCommand)(context);
                 break;

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

@@ -117,7 +117,7 @@ CREATE INDEX IF NOT EXISTS idx_relq_commits_created
     ON _relq_commits(created_at DESC);
 `;
 async function ensureCommitsTable(connection) {
-    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,
@@ -135,7 +135,7 @@ async function ensureCommitsTable(connection) {
     }
 }
 async function getRemoteCommits(connection, limit = 100) {
-    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,
@@ -172,7 +172,7 @@ async function getLatestRemoteCommit(connection) {
     return commits.length > 0 ? commits[0] : null;
 }
 async function addRemoteCommit(connection, commit, limit = 1000) {
-    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,

package/dist/cjs/cli/utils/env-loader.cjs

@@ -4,7 +4,7 @@ exports.loadEnvConfig = loadEnvConfig;
 exports.hasEnvConfig = hasEnvConfig;
 exports.getConnectionDescription = getConnectionDescription;
 function loadEnvConfig() {
-    const connectionString = process.env.DATABASE_CONNECTION_STRING;
+    const connectionString = process.env.RELQ_PG_CONN_URL || process.env.DATABASE_CONNECTION_STRING;
     if (connectionString) {
         return parseConnectionString(connectionString);
     }
@@ -42,7 +42,8 @@ function parseConnectionString(url) {
     }
 }
 function hasEnvConfig() {
-    return !!(process.env.DATABASE_CONNECTION_STRING ||
+    return !!(process.env.RELQ_PG_CONN_URL ||
+        process.env.DATABASE_CONNECTION_STRING ||
         process.env.DATABASE_HOST);
 }
 function getConnectionDescription(config) {

package/dist/cjs/cli/utils/fast-introspect.cjs

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fastIntrospectDatabase = fastIntrospectDatabase;
 async function fastIntrospectDatabase(connection, onProgress, options) {
     const { includeFunctions = false, includeTriggers = false } = options || {};
-    const { Pool } = await Promise.resolve().then(() => __importStar(require("../../../addons/pg.js")));
+    const { Pool } = await Promise.resolve().then(() => __importStar(require("../../addon/pg/index.cjs")));
     onProgress?.('connecting', connection.database);
     const pool = new Pool({
         host: connection.host,

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

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findProjectRoot = findProjectRoot;
+exports.getRelqDir = getRelqDir;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+function findProjectRoot(startDir = process.cwd()) {
+    let currentDir = path.resolve(startDir);
+    const root = path.parse(currentDir).root;
+    while (currentDir !== root) {
+        const packageJsonPath = path.join(currentDir, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            return currentDir;
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    return process.cwd();
+}
+function getRelqDir(startDir = process.cwd()) {
+    const projectRoot = findProjectRoot(startDir) || process.cwd();
+    return path.join(projectRoot, '.relq');
+}
+exports.default = { findProjectRoot, getRelqDir };