relq 1.0.113 → 1.0.115

package/dist/cjs/cli/commands/push.cjs

@@ -57,6 +57,7 @@ const schema_hash_1 = require("../utils/schema-hash.cjs");
 const migration_generator_1 = require("../utils/migration-generator.cjs");
 const migration_helpers_1 = require("../utils/migration-helpers.cjs");
 const ast_transformer_1 = require("../utils/ast-transformer.cjs");
+const types_manager_1 = require("../utils/types-manager.cjs");
 function formatColumnProps(col) {
     if (!col)
         return '';
@@ -110,6 +111,20 @@ function mergeTrackingIds(introspected, desired) {
             }
         }
     }
+    const desiredFuncMap = new Map((desired.functions || []).map(f => [f.name, f]));
+    for (const func of introspected.functions || []) {
+        const desiredFunc = desiredFuncMap.get(func.name);
+        if (desiredFunc?.trackingId) {
+            func.trackingId = desiredFunc.trackingId;
+        }
+    }
+    const desiredTrigMap = new Map((desired.triggers || []).map(t => [t.name, t]));
+    for (const trig of introspected.triggers || []) {
+        const desiredTrig = desiredTrigMap.get(trig.name);
+        if (desiredTrig?.trackingId) {
+            trig.trackingId = desiredTrig.trackingId;
+        }
+    }
     return introspected;
 }
 async function runPush(config, projectRoot, opts = {}) {
@@ -187,14 +202,17 @@ async function runPush(config, projectRoot, opts = {}) {
             }
         }
         const desiredASTCopy = { ...desiredAST };
-        if (!includeFunctions) {
+        if (!includeFunctions || desiredASTCopy.functions.length === 0) {
             dbParsedSchema.functions = [];
             desiredASTCopy.functions = [];
         }
-        if (!includeTriggers) {
+        if (!includeTriggers || desiredASTCopy.triggers.length === 0) {
             dbParsedSchema.triggers = [];
             desiredASTCopy.triggers = [];
         }
+        if (desiredASTCopy.sequences.length === 0) {
+            dbParsedSchema.sequences = [];
+        }
         const comparison = (0, schema_diff_1.compareSchemas)(dbParsedSchema, desiredASTCopy);
         spin.stop('Diff computed');
         if (!comparison.hasChanges && !filteredDiff.hasChanges) {
@@ -235,6 +253,13 @@ async function runPush(config, projectRoot, opts = {}) {
         for (const rename of comparison.renamed.indexes) {
             console.log(`  ${colors_1.colors.cyan('→')} index ${rename.from} → ${rename.to} ${colors_1.colors.muted('(rename index)')}`);
         }
+        const modifiedIndexesByTable = new Map();
+        for (const idx of comparison.modified.indexes) {
+            const list = modifiedIndexesByTable.get(idx.table) || [];
+            list.push(idx);
+            modifiedIndexesByTable.set(idx.table, list);
+        }
+        const shownModifiedIndexTables = new Set();
         for (const table of filteredDiff.tables) {
             if (renamedFromNames.has(table.name) || renamedToNames.has(table.name))
                 continue;
@@ -265,12 +290,29 @@ async function runPush(config, projectRoot, opts = {}) {
                     const prefix = idx.type === 'added' ? colors_1.colors.green('+') : idx.type === 'removed' ? colors_1.colors.red('-') : colors_1.colors.yellow('~');
                     console.log(`      ${prefix} index ${idx.name}`);
                 }
+                const tableModifiedIndexes = modifiedIndexesByTable.get(table.name);
+                if (tableModifiedIndexes) {
+                    for (const midx of tableModifiedIndexes) {
+                        console.log(`      ${colors_1.colors.yellow('~')} index ${midx.newIndex.name} ${colors_1.colors.muted(`(${midx.changes.join(', ')})`)}`);
+                    }
+                    shownModifiedIndexTables.add(table.name);
+                }
                 for (const con of table.constraints || []) {
                     const prefix = con.type === 'added' ? colors_1.colors.green('+') : con.type === 'removed' ? colors_1.colors.red('-') : colors_1.colors.yellow('~');
                     console.log(`      ${prefix} constraint ${con.name}`);
                 }
             }
         }
+        for (const [tableName, indexes] of modifiedIndexesByTable) {
+            if (shownModifiedIndexTables.has(tableName))
+                continue;
+            if (renamedFromNames.has(tableName) || renamedToNames.has(tableName))
+                continue;
+            console.log(`  ${colors_1.colors.yellow('~')} ${colors_1.colors.bold(tableName)}`);
+            for (const midx of indexes) {
+                console.log(`      ${colors_1.colors.yellow('~')} index ${midx.newIndex.name} ${colors_1.colors.muted(`(${midx.changes.join(', ')})`)}`);
+            }
+        }
         for (const e of comparison.added.enums) {
             console.log(`  ${colors_1.colors.green('+')} ${colors_1.colors.bold(e.name)} ${colors_1.colors.muted('(new enum)')}`);
         }
@@ -282,9 +324,6 @@ async function runPush(config, projectRoot, opts = {}) {
             const removed = e.changes.removed.length > 0 ? `-${e.changes.removed.join(',')}` : '';
             console.log(`  ${colors_1.colors.yellow('~')} ${colors_1.colors.bold(e.name)} ${colors_1.colors.muted(`(enum: ${[added, removed].filter(Boolean).join(' ')})`)}`);
         }
-        for (const idx of comparison.modified.indexes) {
-            console.log(`  ${colors_1.colors.yellow('~')} index ${colors_1.colors.bold(idx.newIndex.name)} ${colors_1.colors.muted(`(${idx.changes.join(', ')})`)}`);
-        }
         for (const d of comparison.added.domains) {
             console.log(`  ${colors_1.colors.green('+')} ${colors_1.colors.bold(d.name)} ${colors_1.colors.muted('(new domain)')}`);
         }
@@ -446,6 +485,35 @@ async function runPush(config, projectRoot, opts = {}) {
                 }
             }
         }
+        const modifiedIdxCount = comparison.modified.indexes.length;
+        if (modifiedIdxCount > 0) {
+            let regIdxAdded = 0, regIdxRemoved = 0;
+            for (const t of summaryDiff.tables) {
+                for (const idx of t.indexes || []) {
+                    if (idx.type === 'added')
+                        regIdxAdded++;
+                    else if (idx.type === 'removed')
+                        regIdxRemoved++;
+                }
+            }
+            const idxParts = [];
+            if (regIdxAdded)
+                idxParts.push(colors_1.colors.green(`${regIdxAdded} added`));
+            if (modifiedIdxCount)
+                idxParts.push(colors_1.colors.yellow(`${modifiedIdxCount} modified`));
+            if (regIdxRemoved)
+                idxParts.push(colors_1.colors.red(`${regIdxRemoved} removed`));
+            if (idxParts.length > 0) {
+                const idxLine = `   ${colors_1.colors.muted('indexes:')} ${idxParts.join(', ')}`;
+                const idxLineIdx = summaryLines.findIndex(l => l.includes('indexes:'));
+                if (idxLineIdx >= 0) {
+                    summaryLines[idxLineIdx] = idxLine;
+                }
+                else {
+                    summaryLines.push(idxLine);
+                }
+            }
+        }
         const allSummaryLines = [...renameParts, ...summaryLines];
         if (allSummaryLines.length > 0) {
             for (const line of allSummaryLines)
@@ -587,6 +655,12 @@ async function runPush(config, projectRoot, opts = {}) {
         mergeTrackingIds(updatedSchema, desiredSchema);
         (0, snapshot_manager_1.saveSnapshot)(updatedSchema, snapshotPath, connection.database);
         spin.stop('Snapshot updated');
+        const typesFilePath = (0, types_manager_1.getTypesFilePath)(schemaPath);
+        try {
+            await (0, types_manager_1.syncTypesToDb)(connection, typesFilePath, schemaPath);
+        }
+        catch {
+        }
         const duration = Date.now() - startTime;
         console.log('');
         console.log(`Push completed in ${(0, format_1.formatDuration)(duration)}`);
@@ -623,12 +697,13 @@ async function runPush(config, projectRoot, opts = {}) {
             + comparison.removed.sequences.length + comparison.removed.compositeTypes.length
             + comparison.removed.views.length + comparison.removed.functions.length
             + comparison.removed.triggers.length + comparison.removed.extensions.length;
+        const sIdxModified = comparison.modified.indexes.length;
         const ddlModified = comparison.modified.enums.length;
         const totalRenamed = comparison.renamed.tables.length + comparison.renamed.columns.length
             + comparison.renamed.indexes.length + comparison.renamed.enums.length
             + comparison.renamed.sequences.length + comparison.renamed.functions.length;
         const totalAdded = sTablesAdded + sColsAdded + sIdxAdded + ddlAdded + renColAdded;
-        const totalModified = sTablesModified + sColsModified + ddlModified + renColModified;
+        const totalModified = sTablesModified + sColsModified + sIdxModified + ddlModified + renColModified;
         const totalRemoved = sTablesRemoved + sColsRemoved + sIdxRemoved + ddlRemoved + renColRemoved;
         const parts = [];
         if (totalAdded > 0 || totalModified > 0 || totalRemoved > 0 || totalRenamed > 0) {

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

@@ -111,6 +111,24 @@ async function loadSchemaFile(schemaPath, projectRoot) {
     });
     const schemaModule = await jiti.import(absolutePath);
     const ast = (0, schema_to_ast_1.schemaToAST)(schemaModule);
+    const ext = path.extname(absolutePath);
+    const baseName = absolutePath.slice(0, -ext.length);
+    for (const suffix of ['functions', 'triggers', 'views']) {
+        const companionPath = `${baseName}.${suffix}${ext}`;
+        if (!fs.existsSync(companionPath))
+            continue;
+        const companionModule = await jiti.import(companionPath);
+        const companionAST = (0, schema_to_ast_1.schemaToAST)(companionModule);
+        ast.tables.push(...companionAST.tables);
+        ast.enums.push(...companionAST.enums);
+        ast.domains.push(...companionAST.domains);
+        ast.compositeTypes.push(...companionAST.compositeTypes);
+        ast.sequences.push(...companionAST.sequences);
+        ast.views.push(...companionAST.views);
+        ast.functions.push(...companionAST.functions);
+        ast.triggers.push(...companionAST.triggers);
+        ast.extensions.push(...companionAST.extensions);
+    }
     const tables = ast.tables.map(schema_to_ast_1.parsedTableToTableInfo);
     const schema = {
         tables,

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

@@ -78,11 +78,32 @@ function databaseSchemaToSnapshot(schema, database) {
     for (const table of schema.tables) {
         tables[table.name] = tableToSnapshot(table);
     }
+    const functions = (schema.functions || []).map(f => ({
+        name: f.name,
+        schema: f.schema || 'public',
+        returnType: f.returnType,
+        argTypes: f.argTypes || [],
+        language: f.language,
+        definition: f.definition || '',
+        volatility: f.volatility || 'VOLATILE',
+        ...(f.trackingId ? { trackingId: f.trackingId } : {}),
+    }));
+    const triggers = (schema.triggers || []).map(t => ({
+        name: t.name,
+        tableName: t.tableName,
+        event: t.event,
+        timing: t.timing,
+        forEach: t.forEach,
+        functionName: t.functionName,
+        ...(t.trackingId ? { trackingId: t.trackingId } : {}),
+    }));
     return {
         version: SNAPSHOT_VERSION,
         generatedAt: new Date().toISOString(),
         database,
         tables,
+        functions,
+        triggers,
         appliedMigrations: [],
         extensions: schema.extensions || [],
     };
@@ -151,6 +172,17 @@ function snapshotToDatabaseSchema(snapshot) {
     for (const [, tableSnapshot] of Object.entries(snapshot.tables)) {
         tables.push(snapshotToTable(tableSnapshot));
     }
+    const functions = (snapshot.functions || []).map(f => ({
+        ...f,
+        argTypes: f.argTypes || [],
+        isAggregate: false,
+    }));
+    const triggers = (snapshot.triggers || []).map(t => ({
+        ...t,
+        forEach: (t.forEach || 'ROW'),
+        definition: '',
+        isEnabled: true,
+    }));
     return {
         tables,
         enums: [],
@@ -158,8 +190,8 @@ function snapshotToDatabaseSchema(snapshot) {
         compositeTypes: [],
         sequences: [],
         collations: [],
-        functions: [],
-        triggers: [],
+        functions,
+        triggers,
         policies: [],
         partitions: [],
         foreignServers: [],

package/dist/esm/cli/commands/push.js

@@ -21,6 +21,7 @@ import { normalizeSchema } from "../utils/schema-hash.js";
 import { generateTimestampedName, generateMigrationFromComparison, generateMigrationNameFromComparison } from "../utils/migration-generator.js";
 import { getMigrationTableDDL } from "../utils/migration-helpers.js";
 import { introspectedToParsedSchema } from "../utils/ast-transformer.js";
+import { syncTypesToDb, getTypesFilePath } from "../utils/types-manager.js";
 function formatColumnProps(col) {
     if (!col)
         return '';
@@ -74,6 +75,20 @@ function mergeTrackingIds(introspected, desired) {
             }
         }
     }
+    const desiredFuncMap = new Map((desired.functions || []).map(f => [f.name, f]));
+    for (const func of introspected.functions || []) {
+        const desiredFunc = desiredFuncMap.get(func.name);
+        if (desiredFunc?.trackingId) {
+            func.trackingId = desiredFunc.trackingId;
+        }
+    }
+    const desiredTrigMap = new Map((desired.triggers || []).map(t => [t.name, t]));
+    for (const trig of introspected.triggers || []) {
+        const desiredTrig = desiredTrigMap.get(trig.name);
+        if (desiredTrig?.trackingId) {
+            trig.trackingId = desiredTrig.trackingId;
+        }
+    }
     return introspected;
 }
 export async function runPush(config, projectRoot, opts = {}) {
@@ -151,14 +166,17 @@ export async function runPush(config, projectRoot, opts = {}) {
             }
         }
         const desiredASTCopy = { ...desiredAST };
-        if (!includeFunctions) {
+        if (!includeFunctions || desiredASTCopy.functions.length === 0) {
             dbParsedSchema.functions = [];
             desiredASTCopy.functions = [];
         }
-        if (!includeTriggers) {
+        if (!includeTriggers || desiredASTCopy.triggers.length === 0) {
             dbParsedSchema.triggers = [];
             desiredASTCopy.triggers = [];
         }
+        if (desiredASTCopy.sequences.length === 0) {
+            dbParsedSchema.sequences = [];
+        }
         const comparison = compareSchemas(dbParsedSchema, desiredASTCopy);
         spin.stop('Diff computed');
         if (!comparison.hasChanges && !filteredDiff.hasChanges) {
@@ -199,6 +217,13 @@ export async function runPush(config, projectRoot, opts = {}) {
         for (const rename of comparison.renamed.indexes) {
             console.log(`  ${colors.cyan('→')} index ${rename.from} → ${rename.to} ${colors.muted('(rename index)')}`);
         }
+        const modifiedIndexesByTable = new Map();
+        for (const idx of comparison.modified.indexes) {
+            const list = modifiedIndexesByTable.get(idx.table) || [];
+            list.push(idx);
+            modifiedIndexesByTable.set(idx.table, list);
+        }
+        const shownModifiedIndexTables = new Set();
         for (const table of filteredDiff.tables) {
             if (renamedFromNames.has(table.name) || renamedToNames.has(table.name))
                 continue;
@@ -229,12 +254,29 @@ export async function runPush(config, projectRoot, opts = {}) {
                     const prefix = idx.type === 'added' ? colors.green('+') : idx.type === 'removed' ? colors.red('-') : colors.yellow('~');
                     console.log(`      ${prefix} index ${idx.name}`);
                 }
+                const tableModifiedIndexes = modifiedIndexesByTable.get(table.name);
+                if (tableModifiedIndexes) {
+                    for (const midx of tableModifiedIndexes) {
+                        console.log(`      ${colors.yellow('~')} index ${midx.newIndex.name} ${colors.muted(`(${midx.changes.join(', ')})`)}`);
+                    }
+                    shownModifiedIndexTables.add(table.name);
+                }
                 for (const con of table.constraints || []) {
                     const prefix = con.type === 'added' ? colors.green('+') : con.type === 'removed' ? colors.red('-') : colors.yellow('~');
                     console.log(`      ${prefix} constraint ${con.name}`);
                 }
             }
         }
+        for (const [tableName, indexes] of modifiedIndexesByTable) {
+            if (shownModifiedIndexTables.has(tableName))
+                continue;
+            if (renamedFromNames.has(tableName) || renamedToNames.has(tableName))
+                continue;
+            console.log(`  ${colors.yellow('~')} ${colors.bold(tableName)}`);
+            for (const midx of indexes) {
+                console.log(`      ${colors.yellow('~')} index ${midx.newIndex.name} ${colors.muted(`(${midx.changes.join(', ')})`)}`);
+            }
+        }
         for (const e of comparison.added.enums) {
             console.log(`  ${colors.green('+')} ${colors.bold(e.name)} ${colors.muted('(new enum)')}`);
         }
@@ -246,9 +288,6 @@ export async function runPush(config, projectRoot, opts = {}) {
             const removed = e.changes.removed.length > 0 ? `-${e.changes.removed.join(',')}` : '';
             console.log(`  ${colors.yellow('~')} ${colors.bold(e.name)} ${colors.muted(`(enum: ${[added, removed].filter(Boolean).join(' ')})`)}`);
         }
-        for (const idx of comparison.modified.indexes) {
-            console.log(`  ${colors.yellow('~')} index ${colors.bold(idx.newIndex.name)} ${colors.muted(`(${idx.changes.join(', ')})`)}`);
-        }
         for (const d of comparison.added.domains) {
             console.log(`  ${colors.green('+')} ${colors.bold(d.name)} ${colors.muted('(new domain)')}`);
         }
@@ -410,6 +449,35 @@ export async function runPush(config, projectRoot, opts = {}) {
                 }
             }
         }
+        const modifiedIdxCount = comparison.modified.indexes.length;
+        if (modifiedIdxCount > 0) {
+            let regIdxAdded = 0, regIdxRemoved = 0;
+            for (const t of summaryDiff.tables) {
+                for (const idx of t.indexes || []) {
+                    if (idx.type === 'added')
+                        regIdxAdded++;
+                    else if (idx.type === 'removed')
+                        regIdxRemoved++;
+                }
+            }
+            const idxParts = [];
+            if (regIdxAdded)
+                idxParts.push(colors.green(`${regIdxAdded} added`));
+            if (modifiedIdxCount)
+                idxParts.push(colors.yellow(`${modifiedIdxCount} modified`));
+            if (regIdxRemoved)
+                idxParts.push(colors.red(`${regIdxRemoved} removed`));
+            if (idxParts.length > 0) {
+                const idxLine = `   ${colors.muted('indexes:')} ${idxParts.join(', ')}`;
+                const idxLineIdx = summaryLines.findIndex(l => l.includes('indexes:'));
+                if (idxLineIdx >= 0) {
+                    summaryLines[idxLineIdx] = idxLine;
+                }
+                else {
+                    summaryLines.push(idxLine);
+                }
+            }
+        }
         const allSummaryLines = [...renameParts, ...summaryLines];
         if (allSummaryLines.length > 0) {
             for (const line of allSummaryLines)
@@ -551,6 +619,12 @@ export async function runPush(config, projectRoot, opts = {}) {
         mergeTrackingIds(updatedSchema, desiredSchema);
         saveSnapshot(updatedSchema, snapshotPath, connection.database);
         spin.stop('Snapshot updated');
+        const typesFilePath = getTypesFilePath(schemaPath);
+        try {
+            await syncTypesToDb(connection, typesFilePath, schemaPath);
+        }
+        catch {
+        }
         const duration = Date.now() - startTime;
         console.log('');
         console.log(`Push completed in ${formatDuration(duration)}`);
@@ -587,12 +661,13 @@ export async function runPush(config, projectRoot, opts = {}) {
             + comparison.removed.sequences.length + comparison.removed.compositeTypes.length
             + comparison.removed.views.length + comparison.removed.functions.length
             + comparison.removed.triggers.length + comparison.removed.extensions.length;
+        const sIdxModified = comparison.modified.indexes.length;
         const ddlModified = comparison.modified.enums.length;
         const totalRenamed = comparison.renamed.tables.length + comparison.renamed.columns.length
             + comparison.renamed.indexes.length + comparison.renamed.enums.length
             + comparison.renamed.sequences.length + comparison.renamed.functions.length;
         const totalAdded = sTablesAdded + sColsAdded + sIdxAdded + ddlAdded + renColAdded;
-        const totalModified = sTablesModified + sColsModified + ddlModified + renColModified;
+        const totalModified = sTablesModified + sColsModified + sIdxModified + ddlModified + renColModified;
         const totalRemoved = sTablesRemoved + sColsRemoved + sIdxRemoved + ddlRemoved + renColRemoved;
         const parts = [];
         if (totalAdded > 0 || totalModified > 0 || totalRemoved > 0 || totalRenamed > 0) {

package/dist/esm/cli/utils/schema-loader.js

@@ -75,6 +75,24 @@ export async function loadSchemaFile(schemaPath, projectRoot) {
     });
     const schemaModule = await jiti.import(absolutePath);
     const ast = schemaToAST(schemaModule);
+    const ext = path.extname(absolutePath);
+    const baseName = absolutePath.slice(0, -ext.length);
+    for (const suffix of ['functions', 'triggers', 'views']) {
+        const companionPath = `${baseName}.${suffix}${ext}`;
+        if (!fs.existsSync(companionPath))
+            continue;
+        const companionModule = await jiti.import(companionPath);
+        const companionAST = schemaToAST(companionModule);
+        ast.tables.push(...companionAST.tables);
+        ast.enums.push(...companionAST.enums);
+        ast.domains.push(...companionAST.domains);
+        ast.compositeTypes.push(...companionAST.compositeTypes);
+        ast.sequences.push(...companionAST.sequences);
+        ast.views.push(...companionAST.views);
+        ast.functions.push(...companionAST.functions);
+        ast.triggers.push(...companionAST.triggers);
+        ast.extensions.push(...companionAST.extensions);
+    }
     const tables = ast.tables.map(parsedTableToTableInfo);
     const schema = {
         tables,

package/dist/esm/cli/utils/snapshot-manager.js

@@ -34,11 +34,32 @@ export function databaseSchemaToSnapshot(schema, database) {
     for (const table of schema.tables) {
         tables[table.name] = tableToSnapshot(table);
     }
+    const functions = (schema.functions || []).map(f => ({
+        name: f.name,
+        schema: f.schema || 'public',
+        returnType: f.returnType,
+        argTypes: f.argTypes || [],
+        language: f.language,
+        definition: f.definition || '',
+        volatility: f.volatility || 'VOLATILE',
+        ...(f.trackingId ? { trackingId: f.trackingId } : {}),
+    }));
+    const triggers = (schema.triggers || []).map(t => ({
+        name: t.name,
+        tableName: t.tableName,
+        event: t.event,
+        timing: t.timing,
+        forEach: t.forEach,
+        functionName: t.functionName,
+        ...(t.trackingId ? { trackingId: t.trackingId } : {}),
+    }));
     return {
         version: SNAPSHOT_VERSION,
         generatedAt: new Date().toISOString(),
         database,
         tables,
+        functions,
+        triggers,
         appliedMigrations: [],
         extensions: schema.extensions || [],
     };
@@ -107,6 +128,17 @@ export function snapshotToDatabaseSchema(snapshot) {
     for (const [, tableSnapshot] of Object.entries(snapshot.tables)) {
         tables.push(snapshotToTable(tableSnapshot));
     }
+    const functions = (snapshot.functions || []).map(f => ({
+        ...f,
+        argTypes: f.argTypes || [],
+        isAggregate: false,
+    }));
+    const triggers = (snapshot.triggers || []).map(t => ({
+        ...t,
+        forEach: (t.forEach || 'ROW'),
+        definition: '',
+        isEnabled: true,
+    }));
     return {
         tables,
         enums: [],
@@ -114,8 +146,8 @@ export function snapshotToDatabaseSchema(snapshot) {
         compositeTypes: [],
         sequences: [],
         collations: [],
-        functions: [],
-        triggers: [],
+        functions,
+        triggers,
         policies: [],
         partitions: [],
         foreignServers: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.113",
+  "version": "1.0.115",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",