@relq/orm 0.1.3 → 0.1.5

package/dist/cjs/{core → pg}/helpers/query-convenience.cjs

@@ -42,11 +42,12 @@ exports.executeSoftDelete = executeSoftDelete;
 exports.executeRestore = executeRestore;
 exports.executeCreateWith = executeCreateWith;
 exports.getPrimaryKeyColumn = getPrimaryKeyColumn;
-const count_builder_1 = require("../../count/count-builder.cjs");
-const insert_builder_1 = require("../../insert/insert-builder.cjs");
-const select_builder_1 = require("../../select/select-builder.cjs");
-const update_builder_1 = require("../../update/update-builder.cjs");
-const methods_1 = require("./methods.cjs");
+const count_builder_1 = require("../count/count-builder.cjs");
+const insert_builder_1 = require("../insert/insert-builder.cjs");
+const select_builder_1 = require("../select/select-builder.cjs");
+const update_builder_1 = require("../update/update-builder.cjs");
+const methods_1 = require("../../core/helpers/methods.cjs");
+const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
 async function executeFindById(ctx, id, getPrimaryKeyColumn) {
     const pkColumn = getPrimaryKeyColumn();
     const dbColumn = ctx.relq[methods_1.INTERNAL].transformToDbColumns(ctx.tableName, { [pkColumn]: id });
@@ -150,8 +151,7 @@ async function executeCreateWith(ctx, parentData, related) {
     const schema = internal.getSchema();
     const relations = internal.getRelations();
     if (!schema || !relations) {
-        throw new Error('Cannot use createWith() without schema and relations config. ' +
-            'Use separate insert calls with a transaction instead.');
+        throw new relq_errors_1.RelqBuilderError('Cannot use createWith() without schema and relations config', { builder: 'createWith', hint: 'Pass schema and relations to your Relq client, or use separate insert calls with a transaction instead' });
     }
     const parentSchemaKey = findSchemaKeyByTableName(schema, ctx.tableName) || ctx.tableName;
     try {
@@ -162,20 +162,19 @@ async function executeCreateWith(ctx, parentData, related) {
         const parentSQL = parentBuilder.toString();
         const parentResult = await internal.executeQuery(parentSQL);
         if (!parentResult.result.rows || parentResult.result.rows.length === 0) {
-            throw new Error('Parent insert returned no rows');
+            throw new relq_errors_1.RelqBuilderError('Parent insert returned no rows', { builder: 'createWith', hint: 'Ensure the parent table supports RETURNING * and the insert data is valid' });
         }
         const parentRow = parentResult.result.rows[0];
         for (const [relationKey, childData] of Object.entries(related)) {
             const childTableDef = schema[relationKey];
             if (!childTableDef) {
-                throw new Error(`Unknown table "${relationKey}" in createWith(). Check your schema.`);
+                throw new relq_errors_1.RelqBuilderError(`Unknown table "${relationKey}" in createWith()`, { builder: 'createWith', hint: 'Verify the relation key matches a table name defined in your schema' });
             }
             const childTableName = childTableDef.$name || relationKey;
-            const { resolveForeignKey } = await Promise.resolve().then(() => __importStar(require("../../utils/fk-resolver.cjs")));
+            const { resolveForeignKey } = await Promise.resolve().then(() => __importStar(require("../utils/fk-resolver.cjs")));
             const fk = resolveForeignKey(relations, schema, parentSchemaKey, relationKey);
             if (!fk) {
-                throw new Error(`No FK relationship between "${parentSchemaKey}" and "${relationKey}". ` +
-                    'Define the relationship in your relations config.');
+                throw new relq_errors_1.RelqBuilderError(`No FK relationship between "${parentSchemaKey}" and "${relationKey}"`, { builder: 'createWith', hint: 'Define the relationship in your relations config, or use separate insert calls with explicit FK values' });
             }
             let fkColumn;
             let fkValue;

package/dist/cjs/{core → pg}/helpers/select-joins.cjs

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeTypeSafeJoin = executeTypeSafeJoin;
 exports.executeTypeSafeJoinMany = executeTypeSafeJoinMany;
 exports.executeTypeSafeJoinManyThrough = executeTypeSafeJoinManyThrough;
-const table_proxy_1 = require("../../select/table-proxy.cjs");
-const join_condition_builder_1 = require("../../select/join-condition-builder.cjs");
-const join_internals_1 = require("../../select/join-internals.cjs");
-const join_many_condition_builder_1 = require("../../select/join-many-condition-builder.cjs");
+const table_proxy_1 = require("../select/table-proxy.cjs");
+const join_condition_builder_1 = require("../select/join-condition-builder.cjs");
+const join_internals_1 = require("../select/join-internals.cjs");
+const join_many_condition_builder_1 = require("../select/join-many-condition-builder.cjs");
 const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
-const fk_resolver_1 = require("../../utils/fk-resolver.cjs");
-const methods_1 = require("./methods.cjs");
+const fk_resolver_1 = require("../utils/fk-resolver.cjs");
+const methods_1 = require("../../core/helpers/methods.cjs");
 function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
     const [rightTableKey, rightAlias] = Array.isArray(tableOrAlias)
         ? tableOrAlias
@@ -42,8 +42,8 @@ function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
             conditionBuilder.equal(leftCol, rightCol);
         }
         else {
-            throw new relq_errors_1.RelqQueryError(`Cannot auto-resolve FK relationship between "${ctx.schemaKey || ctx.tableName}" and "${rightTableKey}". ` +
-                `Either provide a callback with explicit join conditions, or define the relationship in your relations config.`, { hint: `Use .join('${rightTableKey}', (on, ${rightTableKey}, source) => on.equal(${rightTableKey}.id, source.columnName))` });
+            throw new relq_errors_1.RelqBuilderError(`No foreign key relationship found between "${ctx.schemaKey || ctx.tableName}" and "${rightTableKey}". ` +
+                `Either provide a callback with explicit join conditions, or define the relationship in your relations config.`, { builder: 'join', hint: `Use .join('${rightTableKey}', (on, ${rightTableKey}, source) => on.equal(${rightTableKey}.fkColumn, source.id))` });
         }
     }
     const selectedProps = conditionInternals.getSelectedColumns();
@@ -66,6 +66,7 @@ function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
             sqlName: colDef.$columnName || toSnake(propName),
         }));
     }
+    const flatConfig = conditionInternals.getFlatConfig();
     const joinClause = {
         type: joinType,
         table: rightTableName,
@@ -73,7 +74,11 @@ function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
         schemaKey: rightTableKey,
         onClause: conditionInternals.toSQL() || undefined,
         usingColumns: conditionInternals.getUsingColumns() || undefined,
-        selectColumns
+        selectColumns,
+        flat: flatConfig ? {
+            mode: 'prefix',
+            prefix: flatConfig.prefix || rightAlias,
+        } : undefined,
     };
     ctx.builder.addStructuredJoin(joinClause);
 }
@@ -172,22 +177,20 @@ function executeTypeSafeJoinManyThrough(ctx, joinType, targetTableOrAlias, junct
     const schema = internal.getSchema();
     const relations = internal.getRelations();
     if (!schema || !relations) {
-        throw new relq_errors_1.RelqQueryError(`Cannot use { through } without schema and relations config.`, { hint: `Define relations in your schema to use the { through } pattern, or use the callback form of joinMany instead.` });
+        throw new relq_errors_1.RelqBuilderError(`Cannot use { through } without schema and relations config. Pass relations when creating Relq: new Relq(schema, dialect, { relations }).`, { builder: 'joinMany', hint: `Use the callback form of joinMany instead, or add relations to your Relq config.` });
     }
-    const leftTableDef = internal.getTableDef(ctx.schemaKey || ctx.tableName);
     const junctionTableDef = internal.getTableDef(junctionTableKey);
     const targetTableDef = internal.getTableDef(targetKey);
-    const leftTableName = leftTableDef?.$name || ctx.tableName;
     const junctionTableName = junctionTableDef?.$name || junctionTableKey;
     const targetTableName = targetTableDef?.$name || targetKey;
     const leftAlias = ctx.builder.getTableIdentifier();
     const leftToJunction = (0, fk_resolver_1.resolveForeignKey)(relations, schema, ctx.schemaKey || ctx.tableName, junctionTableKey);
     if (!leftToJunction) {
-        throw new relq_errors_1.RelqQueryError(`Cannot resolve FK between "${ctx.schemaKey || ctx.tableName}" and junction table "${junctionTableKey}".`, { hint: `Define a foreign key relationship between these tables in your relations config, or use the callback form of joinMany instead.` });
+        throw new relq_errors_1.RelqBuilderError(`No foreign key relationship found between "${ctx.schemaKey || ctx.tableName}" and junction table "${junctionTableKey}". Define the relationship in your relations config.`, { builder: 'joinMany', hint: `Add a relation from "${ctx.schemaKey || ctx.tableName}" to "${junctionTableKey}" in pgRelations(), or use the callback form of joinMany.` });
     }
     const junctionToTarget = (0, fk_resolver_1.resolveForeignKey)(relations, schema, junctionTableKey, targetKey);
     if (!junctionToTarget) {
-        throw new relq_errors_1.RelqQueryError(`Cannot resolve FK between junction table "${junctionTableKey}" and target table "${targetKey}".`, { hint: `Define a foreign key relationship between these tables in your relations config, or use the callback form of joinMany instead.` });
+        throw new relq_errors_1.RelqBuilderError(`No foreign key relationship found between junction table "${junctionTableKey}" and target table "${targetKey}". Define the relationship in your relations config.`, { builder: 'joinMany', hint: `Add a relation from "${junctionTableKey}" to "${targetKey}" in pgRelations(), or use the callback form of joinMany.` });
     }
     const conditionBuilder = new join_many_condition_builder_1.JoinManyConditionBuilder();
     if (callback) {

package/dist/cjs/{core → pg}/helpers/select-pagination.cjs

@@ -8,7 +8,7 @@ exports.executePagination = executePagination;
 const pg_cursor_1 = __importDefault(require("../../addon/cursor.cjs"));
 const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
 const pagination_types_1 = require("../../types/pagination-types.cjs");
-const methods_1 = require("./methods.cjs");
+const methods_1 = require("../../core/helpers/methods.cjs");
 async function executeCursorEach(ctx, callback, options = {}) {
     const batchSize = options.batchSize ?? 100;
     const sql = ctx.builder.toString();

package/dist/cjs/{insert → pg/insert}/conflict-builder.cjs

@@ -8,7 +8,7 @@ exports.createExcludedProxy = createExcludedProxy;
 exports.createRowProxy = createRowProxy;
 exports.createSqlHelpers = createSqlHelpers;
 exports.buildConflictUpdateSql = buildConflictUpdateSql;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 function isColumnRef(value) {
     return typeof value === 'object' && value !== null && value.__type === 'column_ref';
 }
@@ -184,7 +184,7 @@ class ConflictBuilder {
     }
 }
 exports.ConflictBuilder = ConflictBuilder;
-function buildConflictUpdateSql(updateData, tableName, columnResolver) {
+function buildConflictUpdateSql(updateData, _tableName, columnResolver) {
     const resolve = (col) => columnResolver ? columnResolver(col) : col;
     const setClauses = [];
     for (const [column, value] of Object.entries(updateData)) {

package/dist/cjs/{insert → pg/insert}/insert-builder.cjs

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
-const case_converter_1 = require("../utils/case-converter.cjs");
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
+const case_converter_1 = require("../../utils/case-converter.cjs");
 const select_builder_1 = require("../select/select-builder.cjs");
 const count_builder_1 = require("../count/count-builder.cjs");
 const conflict_builder_1 = require("./conflict-builder.cjs");
-const relq_errors_1 = require("../shared/errors/relq-errors.cjs");
+const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
 class InsertBuilder {
     tableName;
     insertData;
@@ -82,8 +82,11 @@ class InsertBuilder {
         if (this.insertData.length === 0) {
             this.originalColumns = Object.keys(normalizedRows[0]).sort();
         }
-        for (const row of normalizedRows) {
-            this.validateColumns(row);
+        if (normalizedRows.length > 0) {
+            this.validateColumns(normalizedRows[0]);
+            if (normalizedRows.length > 1) {
+                this.validateColumns(normalizedRows[normalizedRows.length - 1]);
+            }
         }
         this.insertData.push(...normalizedRows);
         return this;

package/dist/cjs/{insert → pg/insert}/insert-from-select-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertFromSelectBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const conflict_builder_1 = require("./conflict-builder.cjs");
 class InsertFromSelectBuilder {
     tableName;

package/dist/cjs/{pubsub → pg/pubsub}/listen-notify-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotifyBuilder = exports.UnlistenBuilder = exports.ListenBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class ListenBuilder {
     channelName;
     constructor(channelName) {

package/dist/cjs/{pubsub → pg/pubsub}/listener-connection.cjs

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListenerConnection = void 0;
 const node_events_1 = require("node:events");
-const pg_1 = require("../addon/pg.cjs");
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_1 = require("../../addon/pg.cjs");
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class ListenerConnection extends node_events_1.EventEmitter {
     client = null;
     config;

package/dist/cjs/{raw → pg/raw}/raw-query-builder.cjs

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RawQueryBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
-const relq_errors_1 = require("../shared/errors/relq-errors.cjs");
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
+const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
 class RawQueryBuilder {
     query;
     params;

package/dist/cjs/{raw → pg/raw}/sql-template.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlFragment = void 0;
 exports.sql = sql;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class SqlFragment {
     text;
     _isSqlFragment = true;
@@ -20,9 +20,6 @@ exports.SqlFragment = SqlFragment;
 function sqlIdentifier(name) {
     return new SqlFragment(pg_format_1.default.ident(name));
 }
-function sqlRaw(text) {
-    return new SqlFragment(text);
-}
 function sql(strings, ...values) {
     let result = '';
     for (let i = 0; i < strings.length; i++) {
@@ -69,5 +66,3 @@ function formatValue(value) {
     return (0, pg_format_1.default)('%L', String(value));
 }
 sql.id = sqlIdentifier;
-sql.raw = sqlRaw;
-sql.fragment = sqlRaw;

package/dist/cjs/{select → pg/select}/aggregate-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregateQueryBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const condition_collector_1 = require("../condition/condition-collector.cjs");
 const NUMERIC_FUNCS = new Set(['COUNT', 'SUM', 'AVG', 'MIN', 'MAX']);
 class AggregateQueryBuilder {
@@ -87,10 +87,15 @@ class AggregateQueryBuilder {
         this.entries.push({ func: 'BOOL_OR', column, alias: alias || column });
         return this;
     }
-    where(callback) {
-        const collector = new condition_collector_1.ConditionCollector();
-        callback(collector);
-        this.whereConditions.push(...collector.getConditions());
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof condition_collector_1.ConditionCollector) {
+            this.whereConditions.push(...callbackOrCondition.getConditions());
+        }
+        else {
+            const collector = new condition_collector_1.ConditionCollector();
+            callbackOrCondition(collector);
+            this.whereConditions.push(...collector.getConditions());
+        }
         return this;
     }
     having(callback) {

package/dist/cjs/{select → pg/select}/join-builder.cjs

@@ -8,7 +8,7 @@ exports.createJoinManyBuilder = createJoinManyBuilder;
 const join_condition_builder_1 = require("./join-condition-builder.cjs");
 const table_proxy_1 = require("./table-proxy.cjs");
 const condition_collector_1 = require("../condition/condition-collector.cjs");
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class JoinManyBuilder extends join_condition_builder_1.JoinConditionBuilder {
     orderBySpecs = [];
     selectColumns = [];
@@ -127,7 +127,7 @@ class JoinManyBuilder extends join_condition_builder_1.JoinConditionBuilder {
             .map(col => (0, table_proxy_1.columnRefToSQLUnqualified)(col))
             .join(', ');
     }
-    buildWherePart(leftAlias) {
+    buildWherePart(_leftAlias) {
         const parts = [];
         for (const cond of this.conditions) {
             if (cond.type === 'using' || cond.type === 'raw') {

package/dist/cjs/{select → pg/select}/join-condition-builder.cjs

@@ -7,12 +7,13 @@ exports.JoinConditionBuilder = void 0;
 exports.createJoinConditionBuilder = createJoinConditionBuilder;
 const table_proxy_1 = require("./table-proxy.cjs");
 const condition_collector_1 = require("../condition/condition-collector.cjs");
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const join_internals_1 = require("./join-internals.cjs");
 class JoinConditionBuilder {
     conditions = [];
     whereConditions = [];
     selectedColumns;
+    flatConfig;
     equal(left, right) {
         this.conditions.push({
             type: 'equal',
@@ -107,6 +108,14 @@ class JoinConditionBuilder {
         }
         return this;
     }
+    flat() {
+        if (!this.selectedColumns || this.selectedColumns.length === 0) {
+            throw new Error('Relq: .flat() requires .select() with explicit columns. ' +
+                'Cannot flatten without knowing the column set.');
+        }
+        this.flatConfig = { mode: 'prefix' };
+        return this;
+    }
     get [join_internals_1.JOIN_INTERNAL]() {
         return {
             toSQL: () => this.internalToSQL(),
@@ -118,6 +127,7 @@ class JoinConditionBuilder {
             hasConditions: () => this.conditions.length > 0,
             hasWhereConditions: () => this.whereConditions.length > 0,
             getSelectedColumns: () => this.selectedColumns ?? null,
+            getFlatConfig: () => this.flatConfig ?? null,
         };
     }
     internalToSQL() {

package/dist/cjs/{select → pg/select}/join-many-condition-builder.cjs

@@ -8,14 +8,13 @@ exports.createJoinManyConditionBuilder = createJoinManyConditionBuilder;
 const table_proxy_1 = require("./table-proxy.cjs");
 const join_condition_builder_1 = require("./join-condition-builder.cjs");
 const join_internals_1 = require("./join-internals.cjs");
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class JoinManyConditionBuilder extends join_condition_builder_1.JoinConditionBuilder {
     orderSpecs = [];
     limitValue;
     offsetValue;
     innerJoins = [];
     proxyCreator;
-    rightProxy;
     orderBy(column, direction = 'ASC', nulls) {
         this.orderSpecs.push({ column, direction, nulls });
         return this;
@@ -29,9 +28,8 @@ class JoinManyConditionBuilder extends join_condition_builder_1.JoinConditionBui
         return this;
     }
     get [join_internals_1.JOIN_SETUP]() {
-        return (creator, rightProxy) => {
+        return (creator, _rightProxy) => {
             this.proxyCreator = creator;
-            this.rightProxy = rightProxy;
         };
     }
     innerJoin(tableOrAlias, callback) {
@@ -92,6 +90,7 @@ class JoinManyConditionBuilder extends join_condition_builder_1.JoinConditionBui
             hasConditions: () => this.conditions.length > 0,
             hasWhereConditions: () => this.whereConditions.length > 0,
             getSelectedColumns: () => this.selectedColumns ?? null,
+            getFlatConfig: () => this.flatConfig ?? null,
             toSelectSQL: (alias) => this.buildSelectSQL(alias),
             toOrderBySQL: () => this.buildOrderBySQL(),
             toLimitSQL: () => this.buildLimitSQL(),

package/dist/cjs/{select → pg/select}/scalar-query-builder.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScalarQueryBuilderImpl = void 0;
 exports.createScalarTableAccessor = createScalarTableAccessor;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const condition_collector_1 = require("../condition/condition-collector.cjs");
 class ScalarResultImpl {
     sql;
@@ -73,6 +73,36 @@ class ScalarQueryBuilderImpl {
         const sql = `(EXISTS(SELECT 1 FROM ${pg_format_1.default.ident(this.tableName)}${whereClause}))`;
         return new ScalarResultImpl(sql);
     }
+    countDistinct(column) {
+        const sqlColumn = this.resolveColumn(column);
+        const sql = this.buildSQL(`COUNT(DISTINCT ${pg_format_1.default.ident(sqlColumn)})`);
+        return new ScalarResultImpl(sql);
+    }
+    stringAgg(column, delimiter = ', ') {
+        const sqlColumn = this.resolveColumn(column);
+        const sql = this.buildSQL(`STRING_AGG(${pg_format_1.default.ident(sqlColumn)}::text, ${pg_format_1.default.literal(delimiter)})`);
+        return new ScalarResultImpl(sql);
+    }
+    arrayAgg(column) {
+        const sqlColumn = this.resolveColumn(column);
+        const sql = this.buildSQL(`COALESCE(ARRAY_AGG(${pg_format_1.default.ident(sqlColumn)}), ARRAY[]::text[])`);
+        return new ScalarResultImpl(sql);
+    }
+    jsonAgg(column) {
+        const sqlColumn = this.resolveColumn(column);
+        const sql = this.buildSQL(`COALESCE(JSON_AGG(${pg_format_1.default.ident(sqlColumn)}), '[]'::json)`);
+        return new ScalarResultImpl(sql);
+    }
+    boolAnd(column) {
+        const sqlColumn = this.resolveColumn(column);
+        const sql = this.buildSQL(`BOOL_AND(${pg_format_1.default.ident(sqlColumn)})`);
+        return new ScalarResultImpl(sql);
+    }
+    boolOr(column) {
+        const sqlColumn = this.resolveColumn(column);
+        const sql = this.buildSQL(`BOOL_OR(${pg_format_1.default.ident(sqlColumn)})`);
+        return new ScalarResultImpl(sql);
+    }
     resolveColumn(column) {
         if (this.columnResolver) {
             return this.columnResolver(column);

package/dist/cjs/{select → pg/select}/scalar-select-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectedScalarSelectBuilder = exports.ScalarSelectBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const scalar_query_builder_1 = require("./scalar-query-builder.cjs");
 class ScalarSelectBuilder {
     executeQuery;

package/dist/cjs/{select → pg/select}/select-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const condition_collector_1 = require("../condition/condition-collector.cjs");
 class SelectBuilder {
     tableName;
@@ -75,10 +75,15 @@ class SelectBuilder {
         this.isDistinct = true;
         return this;
     }
-    where(callback) {
-        const conditionBuilder = new condition_collector_1.ConditionCollector();
-        callback(conditionBuilder);
-        this.whereConditions.push(...conditionBuilder.getConditions());
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof condition_collector_1.ConditionCollector) {
+            this.whereConditions.push(...callbackOrCondition.getConditions());
+        }
+        else {
+            const conditionBuilder = new condition_collector_1.ConditionCollector();
+            callbackOrCondition(conditionBuilder);
+            this.whereConditions.push(...conditionBuilder.getConditions());
+        }
         return this;
     }
     join(table, condition) {
@@ -277,10 +282,32 @@ class SelectBuilder {
             }
             return pg_format_1.default.ident(col);
         });
+        const hasGroupBy = this.groupByColumns.length > 0
+            || (this.includeExpressions.length > 0 && this.selectColumns.some(c => typeof c === 'string' && c !== '*'));
         for (const join of this.structuredJoins) {
             if (join.type === 'LEFT JOIN LATERAL' || join.type === 'JOIN LATERAL') {
                 columns.push(`${pg_format_1.default.ident(join.alias + '_lateral')}.${pg_format_1.default.ident(join.alias)} AS ${pg_format_1.default.ident(join.alias)}`);
             }
+            else if (hasGroupBy) {
+                if (join.selectColumns && join.selectColumns.length > 0) {
+                    const jsonArgs = join.selectColumns
+                        .map(col => `'${col.property}', ${pg_format_1.default.ident(join.alias)}.${pg_format_1.default.ident(col.sqlName)}`)
+                        .join(', ');
+                    columns.push(`COALESCE(json_agg(json_build_object(${jsonArgs})) FILTER (WHERE ${pg_format_1.default.ident(join.alias)}.${pg_format_1.default.ident(join.selectColumns[0].sqlName)} IS NOT NULL), '[]'::json) AS ${pg_format_1.default.ident(join.alias)}`);
+                }
+                else {
+                    columns.push(`COALESCE(json_agg(row_to_json(${pg_format_1.default.ident(join.alias)}.*)) FILTER (WHERE ${pg_format_1.default.ident(join.alias)} IS NOT NULL), '[]'::json) AS ${pg_format_1.default.ident(join.alias)}`);
+                }
+            }
+            else if (join.flat && join.selectColumns && join.selectColumns.length > 0) {
+                const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
+                const prefix = join.flat.prefix || join.alias;
+                for (const col of join.selectColumns) {
+                    const sqlRef = `${pg_format_1.default.ident(join.alias)}.${pg_format_1.default.ident(col.sqlName)}`;
+                    const alias = `${prefix}${capitalize(col.property)}`;
+                    columns.push(`${sqlRef} AS ${pg_format_1.default.ident(alias)}`);
+                }
+            }
             else if (join.selectColumns && join.selectColumns.length > 0) {
                 const jsonArgs = join.selectColumns
                     .map(col => `'${col.property}', ${pg_format_1.default.ident(join.alias)}.${pg_format_1.default.ident(col.sqlName)}`)
@@ -325,8 +352,14 @@ class SelectBuilder {
             }
             query += ' WHERE ' + (0, condition_collector_1.buildConditionsSQL)(conditions);
         }
-        if (this.groupByColumns.length > 0) {
-            const groupBySQL = this.groupByColumns.map(col => {
+        let effectiveGroupBy = this.groupByColumns;
+        if (effectiveGroupBy.length === 0 && this.includeExpressions.length > 0) {
+            effectiveGroupBy = this.selectColumns
+                .filter(col => typeof col === 'string' && col !== '*')
+                .map(col => col);
+        }
+        if (effectiveGroupBy.length > 0) {
+            const groupBySQL = effectiveGroupBy.map(col => {
                 if (col.includes('.'))
                     return col;
                 if (hasJoins)

package/dist/cjs/pg/select/sql-expression.cjs

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AggregateFunctions = exports.SqlExpression = void 0;
+const table_proxy_1 = require("./table-proxy.cjs");
+class SqlExpression {
+    sql;
+    _isSqlExpression = true;
+    constructor(sql) {
+        this.sql = sql;
+    }
+}
+exports.SqlExpression = SqlExpression;
+class AggregateFunctions {
+    count(ref) {
+        if (!ref)
+            return new SqlExpression('COALESCE(COUNT(*)::integer, 0)');
+        return new SqlExpression(`COALESCE(COUNT(${(0, table_proxy_1.columnRefToSQL)(ref)})::integer, 0)`);
+    }
+    countDistinct(ref) {
+        return new SqlExpression(`COALESCE(COUNT(DISTINCT ${(0, table_proxy_1.columnRefToSQL)(ref)})::integer, 0)`);
+    }
+    sum(ref) {
+        return new SqlExpression(`COALESCE(SUM(${(0, table_proxy_1.columnRefToSQL)(ref)})::float, 0)`);
+    }
+    avg(ref) {
+        return new SqlExpression(`AVG(${(0, table_proxy_1.columnRefToSQL)(ref)})::float`);
+    }
+    min(ref) {
+        return new SqlExpression(`MIN(${(0, table_proxy_1.columnRefToSQL)(ref)})`);
+    }
+    max(ref) {
+        return new SqlExpression(`MAX(${(0, table_proxy_1.columnRefToSQL)(ref)})`);
+    }
+    stringAgg(ref, delimiter = ', ') {
+        return new SqlExpression(`COALESCE(STRING_AGG(${(0, table_proxy_1.columnRefToSQL)(ref)}::text, '${delimiter}'), '')`);
+    }
+    arrayAgg(ref) {
+        return new SqlExpression(`COALESCE(ARRAY_AGG(${(0, table_proxy_1.columnRefToSQL)(ref)}) FILTER (WHERE ${(0, table_proxy_1.columnRefToSQL)(ref)} IS NOT NULL), '{}')`);
+    }
+    arrayAggDistinct(ref) {
+        return new SqlExpression(`COALESCE(ARRAY_AGG(DISTINCT ${(0, table_proxy_1.columnRefToSQL)(ref)}) FILTER (WHERE ${(0, table_proxy_1.columnRefToSQL)(ref)} IS NOT NULL), '{}')`);
+    }
+    boolAnd(ref) {
+        return new SqlExpression(`COALESCE(BOOL_AND(${(0, table_proxy_1.columnRefToSQL)(ref)}), false)`);
+    }
+    boolOr(ref) {
+        return new SqlExpression(`COALESCE(BOOL_OR(${(0, table_proxy_1.columnRefToSQL)(ref)}), false)`);
+    }
+    stddev(ref) {
+        return new SqlExpression(`STDDEV(${(0, table_proxy_1.columnRefToSQL)(ref)})::float`);
+    }
+    variance(ref) {
+        return new SqlExpression(`VARIANCE(${(0, table_proxy_1.columnRefToSQL)(ref)})::float`);
+    }
+}
+exports.AggregateFunctions = AggregateFunctions;

package/dist/cjs/{transaction → pg/transaction}/transaction-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SavepointBuilder = exports.TransactionBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class TransactionBuilder {
     isolationLevel;
     mode;

package/dist/cjs/{update → pg/update}/array-update-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayUpdateBuilder = exports.ArrayJsonbUpdateBuilder = exports.ArrayDateUpdateBuilder = exports.ArrayUuidUpdateBuilder = exports.ArrayBooleanUpdateBuilder = exports.ArrayNumericUpdateBuilder = exports.ArrayStringUpdateBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class ArrayStringUpdateBuilder {
     set(values) {
         if (values.length === 0)
@@ -200,10 +200,7 @@ class ArrayJsonbUpdateBuilder {
 }
 exports.ArrayJsonbUpdateBuilder = ArrayJsonbUpdateBuilder;
 class ArrayUpdateBuilder {
-    currentColumn;
-    constructor(currentColumn) {
-        this.currentColumn = currentColumn;
-    }
+    constructor(_currentColumn) { }
     get string() {
         return new ArrayStringUpdateBuilder();
     }