@relq/orm 0.1.3 → 0.1.4

package/dist/esm/{update → pg/update}/update-builder.js

@@ -1,8 +1,9 @@
-import format from "../shared/pg-format.js";
+import format from "../../shared/pg-format.js";
 import { ConditionCollector, buildConditionsSQL } from "../condition/condition-collector.js";
-import { convertCase } from "../utils/case-converter.js";
+import { convertCase } from "../../utils/case-converter.js";
 import { ArrayUpdateBuilder } from "./array-update-builder.js";
 import { JsonbUpdateBuilder } from "./jsonb-update-builder.js";
+import { ColumnExpressionBuilder } from "./column-expression-builder.js";
 import { SelectBuilder } from "../select/select-builder.js";
 import { CountBuilder } from "../count/count-builder.js";
 export class UpdateBuilder {
@@ -71,10 +72,15 @@ export class UpdateBuilder {
         this._convertCase = conversionCase;
         return this;
     }
-    where(callback) {
-        const conditionBuilder = new ConditionCollector();
-        callback(conditionBuilder);
-        this.whereConditions.push(...conditionBuilder.getConditions());
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof ConditionCollector) {
+            this.whereConditions.push(...callbackOrCondition.getConditions());
+        }
+        else {
+            const conditionBuilder = new ConditionCollector();
+            callbackOrCondition(conditionBuilder);
+            this.whereConditions.push(...conditionBuilder.getConditions());
+        }
         return this;
     }
     returning(columns) {
@@ -178,7 +184,8 @@ export class UpdateBuilder {
             if (typeof val === 'function') {
                 const operationsBuilder = {
                     array: new ArrayUpdateBuilder(col),
-                    jsonb: new JsonbUpdateBuilder()
+                    jsonb: new JsonbUpdateBuilder(),
+                    col: new ColumnExpressionBuilder()
                 };
                 const result = val(operationsBuilder);
                 const finalResult = result.replace(/__COLUMN__/g, format.ident(convertedCol));

package/dist/esm/pg/utils/addon/pg/cursor.js

@@ -0,0 +1 @@
+export { default } from "../../../../addon/cursor.js";

package/dist/esm/pg/utils/addon/pg/pg.js

@@ -0,0 +1,2 @@
+export * from "../../../../addon/pg.js";
+export { default } from "../../../../addon/pg.js";

package/dist/esm/{utils → pg/utils}/fk-resolver.js

@@ -8,26 +8,6 @@ export class ForeignKeyResolutionError extends Error {
         this.name = 'ForeignKeyResolutionError';
     }
 }
-function isArrayFormat(tableRelations) {
-    return Array.isArray(tableRelations);
-}
-function* iterateForeignKeys(tableRelations) {
-    if (!tableRelations)
-        return;
-    if (isArrayFormat(tableRelations)) {
-        for (const relationDef of tableRelations) {
-            if (relationDef.$type === 'foreignKey' && relationDef.$columns?.length > 0) {
-                const columnKey = relationDef.$columns[0].column;
-                yield [columnKey, relationDef];
-            }
-        }
-    }
-    else {
-        for (const [columnKey, relationDef] of Object.entries(tableRelations)) {
-            yield [columnKey, relationDef];
-        }
-    }
-}
 export function resolveForeignKey(relations, schema, fromTableKey, toTableKey) {
     if (!relations) {
         return null;
@@ -57,18 +37,55 @@ export function resolveForeignKey(relations, schema, fromTableKey, toTableKey) {
     }
     const toTableRelations = relations[toTableKey];
     if (toTableRelations) {
-        for (const [columnKey, relationDef] of Object.entries(toTableRelations)) {
+        const entries = Array.isArray(toTableRelations)
+            ? toTableRelations.map((def, i) => [String(i), def])
+            : Object.entries(toTableRelations);
+        const candidates = [];
+        for (const [columnKey, relationDef] of entries) {
             if (relationDef.$type === 'foreignKey' && relationDef.$targetTable === fromTableName) {
-                const toColumn = getSourceColumnName(toTableDef, columnKey, relationDef);
-                const fromColumn = getTargetColumnName(relationDef, fromTableDef);
-                return {
-                    fromTable: fromTableName,
-                    fromColumn,
-                    toTable: toTableName,
-                    toColumn,
-                    direction: 'reverse'
-                };
+                candidates.push({ columnKey, relationDef: relationDef });
+            }
+        }
+        if (candidates.length > 0) {
+            let best = candidates[0];
+            if (candidates.length > 1 && toTableDef) {
+                const columns = toTableDef.$columns || toTableDef;
+                let bestScore = 0;
+                for (const candidate of candidates) {
+                    const colSqlName = candidate.relationDef.$columns?.[0]?.column;
+                    if (!colSqlName || !columns)
+                        continue;
+                    for (const [propKey, rawColDef] of Object.entries(columns)) {
+                        if (!rawColDef)
+                            continue;
+                        const colDef = rawColDef;
+                        const sqlName = colDef.$columnName || colDef.$sqlName || colDef.$name;
+                        if (sqlName !== colSqlName && propKey !== colSqlName)
+                            continue;
+                        let score = 0;
+                        if (colDef.$primaryKey === true) {
+                            score = 2;
+                        }
+                        else if (colDef.$nullable === false || colDef.$notNull === true) {
+                            score = 1;
+                        }
+                        if (score > bestScore) {
+                            bestScore = score;
+                            best = candidate;
+                        }
+                        break;
+                    }
+                }
             }
+            const toColumn = getSourceColumnName(toTableDef, best.columnKey, best.relationDef);
+            const fromColumn = getTargetColumnName(best.relationDef, fromTableDef);
+            return {
+                fromTable: fromTableName,
+                fromColumn,
+                toTable: toTableName,
+                toColumn,
+                direction: 'reverse'
+            };
         }
     }
     return null;

package/dist/esm/{window → pg/window}/window-builder.js

@@ -1,4 +1,4 @@
-import format from "../shared/pg-format.js";
+import format from "../../shared/pg-format.js";
 export class WindowBuilder {
     partitionColumns = [];
     orderColumns = [];