linkgress-orm 0.0.2 → 0.1.0

package/dist/query/conditions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionBuilder = exports.SqlFragment = exports.BetweenComparison = exports.NotInComparison = exports.InComparison = exports.IsNotNullComparison = exports.IsNullComparison = exports.ILikeComparison = exports.LikeComparison = exports.LteComparison = exports.LtComparison = exports.GteComparison = exports.GtComparison = exports.NeComparison = exports.EqComparison = exports.RawSqlCondition = exports.LogicalCondition = exports.WhereComparisonBase = exports.WhereConditionBase = void 0;
+exports.ConditionBuilder = exports.sql = exports.RawSql = exports.SqlFragment = exports.BetweenComparison = exports.NotInComparison = exports.InComparison = exports.IsNotNullComparison = exports.IsNullComparison = exports.ILikeComparison = exports.LikeComparison = exports.LteComparison = exports.LtComparison = exports.GteComparison = exports.GtComparison = exports.NeComparison = exports.EqComparison = exports.RawSqlCondition = exports.LogicalCondition = exports.WhereComparisonBase = exports.WhereConditionBase = void 0;
 exports.eq = eq;
 exports.ne = ne;
 exports.gt = gt;
@@ -17,11 +17,17 @@ exports.between = between;
 exports.and = and;
 exports.or = or;
 exports.not = not;
-exports.sql = sql;
 /**
  * Base class for all WHERE conditions with helper methods
  */
 class WhereConditionBase {
+    /**
+     * Get all field references used in this condition.
+     * Used to detect navigation property references that need JOINs.
+     */
+    getFieldRefs() {
+        return [];
+    }
     /**
      * Helper to check if a value is a FieldRef
      */
@@ -83,6 +89,19 @@ class WhereComparisonBase extends WhereConditionBase {
         this.field = field;
         this.value = value;
     }
+    /**
+     * Get all field references used in this comparison
+     */
+    getFieldRefs() {
+        const refs = [];
+        if (this.isFieldRef(this.field)) {
+            refs.push(this.field);
+        }
+        if (this.value !== undefined && this.isFieldRef(this.value)) {
+            refs.push(this.value);
+        }
+        return refs;
+    }
     /**
      * Build the comparison SQL
      * Can be overridden for custom behavior
@@ -110,6 +129,16 @@ class LogicalCondition extends WhereConditionBase {
         this.operator = operator;
         this.conditions = conditions;
     }
+    /**
+     * Get all field references from nested conditions
+     */
+    getFieldRefs() {
+        const refs = [];
+        for (const cond of this.conditions) {
+            refs.push(...cond.getFieldRefs());
+        }
+        return refs;
+    }
     buildSql(context) {
         if (this.conditions.length === 0) {
             return '1=1';
@@ -267,6 +296,19 @@ class BetweenComparison extends WhereComparisonBase {
         this.min = min;
         this.max = max;
     }
+    /**
+     * Get all field references including min and max
+     */
+    getFieldRefs() {
+        const refs = super.getFieldRefs();
+        if (this.isFieldRef(this.min)) {
+            refs.push(this.min);
+        }
+        if (this.isFieldRef(this.max)) {
+            refs.push(this.max);
+        }
+        return refs;
+    }
     buildSql(context) {
         const fieldName = this.getDbColumnName(this.field); // Returns already quoted name
         const minSide = this.getRightSide(this.min, context);
@@ -377,6 +419,27 @@ class SqlFragment extends WhereConditionBase {
     getAlias() {
         return this.alias;
     }
+    /**
+     * Get all field references from the fragment values
+     */
+    getFieldRefs() {
+        const refs = [];
+        for (const value of this.values) {
+            if (this.isFieldRef(value)) {
+                refs.push(value);
+            }
+            else if (value instanceof SqlFragment) {
+                refs.push(...value.getFieldRefs());
+            }
+        }
+        return refs;
+    }
+    /**
+     * Check if value is a RawSql instance
+     */
+    isRawSql(value) {
+        return value instanceof RawSql;
+    }
     /**
      * Build the SQL string with proper parameter placeholders
      */
@@ -386,8 +449,12 @@ class SqlFragment extends WhereConditionBase {
             sql += this.sqlParts[i];
             if (i < this.values.length) {
                 const value = this.values[i];
+                // Check if value is a RawSql - insert directly without parameterization
+                if (this.isRawSql(value)) {
+                    sql += value.value;
+                }
                 // Check if value is a FieldRef
-                if (this.isFieldRef(value)) {
+                else if (this.isFieldRef(value)) {
                     // It's a field reference - use the database column name with table alias if present
                     if ('__tableAlias' in value && value.__tableAlias) {
                         sql += `"${value.__tableAlias}"."${value.__dbColumnName}"`;
@@ -422,13 +489,107 @@ class SqlFragment extends WhereConditionBase {
     }
 }
 exports.SqlFragment = SqlFragment;
+/**
+ * Marker class for raw SQL strings that should be inserted without parameterization
+ * Used by sql.raw() to inject SQL directly into queries
+ */
+class RawSql {
+    constructor(value) {
+        this.value = value;
+    }
+}
+exports.RawSql = RawSql;
 /**
  * Tagged template literal for creating SQL fragments
  * Usage: sql`lower(${field})` or sql`${field} = ${value}`
  */
-function sql(strings, ...values) {
+function sqlTemplate(strings, ...values) {
     return new SqlFragment(Array.from(strings), values);
 }
+/**
+ * Create a raw SQL string that will be inserted directly without parameterization
+ * WARNING: Do not use with user input - this can lead to SQL injection!
+ * Use for table names, column names, SQL keywords, or trusted static strings only.
+ *
+ * @example
+ * // Use for dynamic table/column names
+ * sql`SELECT * FROM ${sql.raw(tableName)} WHERE ${sql.raw(columnName)} = ${value}`
+ *
+ * // Use for SQL keywords/operators
+ * sql`SELECT * FROM users ORDER BY name ${sql.raw(sortDirection)}`
+ *
+ * // Use for complex SQL that shouldn't be parameterized
+ * sql`SELECT ${sql.raw('COUNT(*)')} FROM users`
+ */
+function raw(value) {
+    return new RawSql(value);
+}
+/**
+ * Create an empty SQL fragment
+ * Useful for conditional SQL building
+ *
+ * @example
+ * const condition = shouldFilter ? sql`WHERE active = true` : sql.empty;
+ */
+const empty = new SqlFragment([''], []);
+/**
+ * Join multiple SQL fragments with a separator
+ *
+ * @example
+ * const columns = [sql`name`, sql`email`, sql`age`];
+ * const selectList = sql.join(columns, sql`, `);
+ * // Result: name, email, age
+ */
+function join(fragments, separator = new SqlFragment([', '], [])) {
+    if (fragments.length === 0) {
+        return empty;
+    }
+    if (fragments.length === 1) {
+        return fragments[0];
+    }
+    // Build combined parts and values
+    const parts = [];
+    const values = [];
+    for (let i = 0; i < fragments.length; i++) {
+        const fragment = fragments[i];
+        const fragmentParts = fragment.sqlParts;
+        const fragmentValues = fragment.values;
+        if (i > 0) {
+            // Add separator
+            const sepParts = separator.sqlParts;
+            const sepValues = separator.values;
+            // Merge last part of current result with separator's first part
+            if (parts.length > 0) {
+                parts[parts.length - 1] += sepParts[0];
+            }
+            else {
+                parts.push(sepParts[0]);
+            }
+            for (let j = 0; j < sepValues.length; j++) {
+                values.push(sepValues[j]);
+                parts.push(sepParts[j + 1]);
+            }
+        }
+        // Add fragment
+        if (parts.length > 0 && fragmentParts.length > 0) {
+            parts[parts.length - 1] += fragmentParts[0];
+        }
+        else if (fragmentParts.length > 0) {
+            parts.push(fragmentParts[0]);
+        }
+        for (let j = 0; j < fragmentValues.length; j++) {
+            values.push(fragmentValues[j]);
+            parts.push(fragmentParts[j + 1]);
+        }
+    }
+    return new SqlFragment(parts, values);
+}
+// Create the sql function with additional methods
+exports.sql = Object.assign(sqlTemplate, {
+    raw,
+    empty,
+    join,
+});
 // ============================================================================
 // SQL builder for conditions
 // ============================================================================

package/dist/query/conditions.js.map

@@ -1 +1 @@
-{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../src/query/conditions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../src/query/conditions.ts"],"names":[],"mappings":"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"}

package/dist/query/cte-builder.d.ts

@@ -1,4 +1,13 @@
-import { SelectQueryBuilder } from './query-builder';
+import { SelectQueryBuilder, ResolveCollectionResults } from './query-builder';
+import { UnwrapSelection } from './conditions';
+/**
+ * Interface for queries that can be used in CTEs
+ * Supports SelectQueryBuilder, EntitySelectQueryBuilder, GroupedJoinedQueryBuilder
+ * The TSelection type is inferred from the query's type parameter
+ */
+interface CteCompatibleQuery<TSelection> {
+    toList: () => Promise<ResolveCollectionResults<TSelection>[] | TSelection[]>;
+}
 /**
  * Represents a Common Table Expression (CTE) with strong typing
  */
@@ -56,11 +65,16 @@ export declare class DbCteBuilder {
      *   'items'
      * );
      */
-    withAggregation<TSelection extends Record<string, unknown>, TKey extends Record<string, unknown>, TAlias extends string = 'items'>(cteName: string, query: SelectQueryBuilder<TSelection> | {
-        toList: () => Promise<TSelection[]>;
-    }, keySelector: (value: TSelection) => TKey, aggregationAlias?: TAlias): DbCte<TKey & {
+    withAggregation<TSelection extends Record<string, unknown>, TKey extends Record<string, unknown>, TAlias extends string = 'items'>(cteName: string, query: SelectQueryBuilder<TSelection> | CteCompatibleQuery<TSelection>, keySelector: (value: TSelection) => TKey, aggregationAlias?: TAlias): DbCte<UnwrapSelection<TKey> & {
         [K in TAlias]: Array<AggregatedItemType<TSelection, TKey>>;
     }>;
+    /**
+     * Build inner query SQL - handles different query builder types
+     * - SelectQueryBuilder: uses createMockRow() and selector()
+     * - GroupedSelectQueryBuilder: uses buildCteQuery()
+     * - GroupedJoinedQueryBuilder: uses buildCteQuery()
+     */
+    private buildInnerQuerySql;
     /**
      * Get all CTEs created by this builder
      */
@@ -84,12 +98,14 @@ export declare class DbCteBuilder {
 export type InferCteColumns<T> = T extends DbCte<infer TColumns> ? TColumns : never;
 /**
  * Type helper for aggregated items - removes the grouping keys from the selection
+ * and unwraps DbColumn/SqlFragment types to their underlying values
  */
 export type AggregatedItemType<TSelection extends Record<string, unknown>, TKey extends Record<string, unknown>> = {
-    [K in Exclude<keyof TSelection, keyof TKey>]: TSelection[K];
+    [K in Exclude<keyof TSelection, keyof TKey>]: UnwrapSelection<TSelection[K]>;
 };
 /**
  * Check if a value is a CTE
  */
 export declare function isCte(value: any): value is DbCte<any>;
+export {};
 //# sourceMappingURL=cte-builder.d.ts.map

package/dist/query/cte-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cte-builder.d.ts","sourceRoot":"","sources":["../../src/query/cte-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGnE;;GAEG;AACH,qBAAa,KAAK,CAAC,QAAQ;aAEP,IAAI,EAAE,MAAM;aACZ,KAAK,EAAE,MAAM;aACb,MAAM,EAAE,OAAO,EAAE;aACjB,UAAU,EAAE,QAAQ;aACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;gBAJvC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,EAAE,EACjB,UAAU,EAAE,QAAQ,EACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAA;IAGzD;;OAEG;IACH,SAAS,CAAC,CAAC,SAAS,MAAM,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;CAGhE;AAED;;GAEG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,WAAW,CAAa;;IAIhC;;;;;;;;;;;;;;OAcG;IACH,IAAI,CAAC,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,CAAC,UAAU,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;KAAE,GAC9E;QAAE,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;KAAE;IA6B7B;;;;;;;;;;;;;;OAcG;IACH,eAAe,CACb,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,SAAS,MAAM,GAAG,OAAO,EAE/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,CAAC,UAAU,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;KAAE,EAC/E,WAAW,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,EACxC,gBAAgB,CAAC,EAAE,MAAM,GACxB,KAAK,CAAC,IAAI,GAAG;SAAG,CAAC,IAAI,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;KAAE,CAAC;IAuD/E;;OAEG;IACH,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;IAIvB;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;OAEG;IACH,OAAO,CAAC,cAAc;CAUvB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,MAAM,QAAQ,CAAC,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEpF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAC5B,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAClC;KACD,CAAC,IAAI,OAAO,CAAC,MAAM,UAAU,EAAE,MAAM,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAErD"}
+{"version":3,"file":"cte-builder.d.ts","sourceRoot":"","sources":["../../src/query/cte-builder.ts"],"names":[],"mappings":"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"}

package/dist/query/cte-builder.js

@@ -86,13 +86,8 @@ class DbCteBuilder {
             paramCounter: this.paramOffset,
             params: [],
         };
-        // Build the inner query
-        const innerSql = query.buildQuery(query.selector(query.createMockRow()), {
-            ctes: new Map(),
-            cteCounter: 0,
-            paramCounter: context.paramCounter,
-            allParams: context.params,
-        }).sql;
+        // Build the inner query - handle different query builder types
+        const innerSql = this.buildInnerQuerySql(query, context);
         // Get group by columns
         const mockItem = this.createMockItem();
         const groupByResult = keySelector(mockItem);
@@ -125,6 +120,35 @@ class DbCteBuilder {
         this.ctes.push(cte);
         return cte;
     }
+    /**
+     * Build inner query SQL - handles different query builder types
+     * - SelectQueryBuilder: uses createMockRow() and selector()
+     * - GroupedSelectQueryBuilder: uses buildCteQuery()
+     * - GroupedJoinedQueryBuilder: uses buildCteQuery()
+     */
+    buildInnerQuerySql(query, context) {
+        const queryContext = {
+            ctes: new Map(),
+            cteCounter: 0,
+            paramCounter: context.paramCounter,
+            allParams: context.params,
+        };
+        // Check for grouped query builders that have buildCteQuery method
+        if (typeof query.buildCteQuery === 'function') {
+            const result = query.buildCteQuery(queryContext);
+            context.paramCounter = queryContext.paramCounter;
+            return result.sql;
+        }
+        // Standard SelectQueryBuilder - uses createMockRow and selector
+        if (typeof query.createMockRow === 'function' && typeof query.selector === 'function') {
+            const mockRow = query.createMockRow();
+            const selectionResult = query.selector(mockRow);
+            const result = query.buildQuery(selectionResult, queryContext);
+            context.paramCounter = queryContext.paramCounter;
+            return result.sql;
+        }
+        throw new Error('Unsupported query type for CTE. Query must be a SelectQueryBuilder, GroupedSelectQueryBuilder, or GroupedJoinedQueryBuilder.');
+    }
     /**
      * Get all CTEs created by this builder
      */

package/dist/query/cte-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"cte-builder.js","sourceRoot":"","sources":["../../src/query/cte-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cte-builder.js","sourceRoot":"","sources":["../../src/query/cte-builder.ts"],"names":[],"mappings":"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"}

package/dist/query/grouped-query.d.ts

@@ -1,15 +1,70 @@
-import { Condition, FieldRef } from './conditions';
+import { Condition, SqlFragment, FieldRef } from './conditions';
 import { TableSchema } from '../schema/table-builder';
 import type { DatabaseClient } from '../database/database-client.interface';
-import type { QueryExecutor } from '../entity/db-context';
+import type { QueryExecutor, OrderDirection } from '../entity/db-context';
 import { Subquery } from './subquery';
-import type { ManualJoinDefinition } from './query-builder';
+import type { ManualJoinDefinition, JoinType } from './query-builder';
+import { DbCte } from './cte-builder';
+/**
+ * Query context for tracking CTEs and parameters
+ */
+interface QueryContext {
+    ctes: Map<string, {
+        sql: string;
+        params: any[];
+    }>;
+    cteCounter: number;
+    paramCounter: number;
+    allParams: any[];
+}
+/**
+ * Type helper to detect if a type is a class instance (has prototype methods)
+ * vs a plain data object. See conditions.ts for detailed explanation.
+ * Excludes DbColumn and SqlFragment which have valueOf but are not value types.
+ */
+type IsClassInstance<T> = T extends {
+    __isDbColumn: true;
+} ? false : T extends SqlFragment<any> ? false : T extends {
+    valueOf(): infer V;
+} ? V extends T ? true : V extends number | string | boolean | bigint | symbol ? true : false : false;
+/**
+ * Check for types with known class method signatures
+ */
+type HasClassMethods<T> = T extends {
+    getTime(): number;
+} ? true : T extends {
+    size: number;
+    has(value: any): boolean;
+} ? true : T extends {
+    byteLength: number;
+} ? true : T extends {
+    then(onfulfilled?: any): any;
+} ? true : T extends {
+    message: string;
+    name: string;
+} ? true : T extends {
+    exec(string: string): any;
+} ? true : false;
+/**
+ * Combined check for value types that should not be recursively processed
+ */
+type IsValueType<T> = IsClassInstance<T> extends true ? true : HasClassMethods<T> extends true ? true : false;
 /**
  * Type helper to resolve FieldRef types to their value types
+ * Preserves class instances (Date, Map, Set, Temporal, etc.) as-is
  */
-type ResolveFieldRefs<T> = T extends FieldRef<any, infer V> ? V : T extends Array<infer U> ? Array<ResolveFieldRefs<U>> : T extends object ? {
+type ResolveFieldRefs<T> = T extends FieldRef<any, infer V> ? V : T extends Array<infer U> ? Array<ResolveFieldRefs<U>> : T extends object ? IsValueType<T> extends true ? T : {
     [K in keyof T]: ResolveFieldRefs<T[K]>;
 } : T;
+/**
+ * Type helper to convert resolved value types back to FieldRef for join conditions
+ * This allows join conditions to accept either the value or FieldRef
+ * If a field is already a FieldRef, it preserves it without double-wrapping
+ * Preserves class instances (Date, Map, Set, Temporal, etc.) as-is
+ */
+type ToFieldRefs<T> = T extends object ? IsValueType<T> extends true ? FieldRef<string, T> : {
+    [K in keyof T]: T[K] extends FieldRef<any, infer V> ? FieldRef<string, V> : FieldRef<string, T[K]>;
+} : T extends FieldRef<any, infer V> ? FieldRef<string, V> : FieldRef<string, T>;
 /**
  * Represents a grouped item with access to the grouping key and aggregate functions
  * TGroupingKey: The shape of the grouping key (e.g., { street: string })
@@ -42,8 +97,9 @@ export interface GroupedItem<TGroupingKey, TOriginalRow> {
     /**
      * Get the average value of a numeric field across all items in this group
      * Always returns number since average is always numeric
+     * Accepts undefined since SQL AVG ignores NULL values
      */
-    avg(selector: (item: TOriginalRow) => FieldRef<any, number> | number): number;
+    avg(selector: (item: TOriginalRow) => FieldRef<any, number | undefined> | number | undefined): number;
 }
 /**
  * Aggregate field reference - used in HAVING clauses
@@ -130,9 +186,9 @@ export declare class GroupedSelectQueryBuilder<TSelection, TOriginalRow, TGroupi
      * .orderBy(p => [p.colName, p.otherCol])
      * .orderBy(p => [[p.colName, 'ASC'], [p.otherCol, 'DESC']])
      */
-    orderBy(selector: (row: TSelection) => any): this;
-    orderBy(selector: (row: TSelection) => any[]): this;
-    orderBy(selector: (row: TSelection) => Array<[any, 'ASC' | 'DESC']>): this;
+    orderBy<T>(selector: (row: TSelection) => T): this;
+    orderBy<T>(selector: (row: TSelection) => T[]): this;
+    orderBy<T>(selector: (row: TSelection) => Array<[T, OrderDirection]>): this;
     /**
      * Execute query and return results
      */
@@ -153,6 +209,53 @@ export declare class GroupedSelectQueryBuilder<TSelection, TOriginalRow, TGroupi
      * Convert to subquery for use in other queries
      */
     asSubquery<TMode extends 'scalar' | 'array' | 'table' = 'table'>(mode?: TMode): Subquery<TMode extends 'scalar' ? ResolveFieldRefs<TSelection> : TMode extends 'array' ? ResolveFieldRefs<TSelection>[] : ResolveFieldRefs<TSelection>, TMode>;
+    /**
+     * Build SQL for use in CTEs - public interface for CTE builder
+     * @internal
+     */
+    buildCteQuery(queryContext: QueryContext): {
+        sql: string;
+        params: any[];
+    };
+    /**
+     * Add a LEFT JOIN to the grouped query result
+     * This wraps the grouped query as a subquery and joins to it
+     *
+     * @example
+     * const result = await db.orders
+     *   .select(o => ({ customerId: o.customerId, total: o.total }))
+     *   .groupBy(o => ({ customerId: o.customerId }))
+     *   .select(g => ({ customerId: g.key.customerId, totalSum: g.sum(o => o.total) }))
+     *   .leftJoin(
+     *     customerDetailsCte,
+     *     (grouped, details) => eq(grouped.customerId, details.customerId),
+     *     (grouped, details) => ({ ...grouped, details: details.items })
+     *   )
+     *   .toList();
+     */
+    leftJoin<TRight extends Record<string, any>, TNewSelection>(rightSource: Subquery<TRight, 'table'> | DbCte<TRight>, condition: (left: ToFieldRefs<TSelection>, right: ToFieldRefs<TRight>) => Condition, selector: (left: ToFieldRefs<TSelection>, right: ToFieldRefs<TRight>) => TNewSelection, alias?: string): GroupedJoinedQueryBuilder<TNewSelection, ToFieldRefs<TSelection>, ToFieldRefs<TRight>>;
+    /**
+     * Add an INNER JOIN to the grouped query result
+     * This wraps the grouped query as a subquery and joins to it
+     */
+    innerJoin<TRight extends Record<string, any>, TNewSelection>(rightSource: Subquery<TRight, 'table'> | DbCte<TRight>, condition: (left: ToFieldRefs<TSelection>, right: ToFieldRefs<TRight>) => Condition, selector: (left: ToFieldRefs<TSelection>, right: ToFieldRefs<TRight>) => TNewSelection, alias?: string): GroupedJoinedQueryBuilder<TNewSelection, ToFieldRefs<TSelection>, ToFieldRefs<TRight>>;
+    /**
+     * Internal join implementation
+     */
+    private joinInternal;
+    /**
+     * Create a mock object for the current selection (for join conditions)
+     * The key is the alias used in the SELECT clause, so we use it as __dbColumnName
+     */
+    private createMockForSelection;
+    /**
+     * Create a mock for a subquery result
+     */
+    private createMockForSubquery;
+    /**
+     * Create a mock for a CTE
+     */
+    private createMockForCte;
     /**
      * Build the SQL query for grouped results
      */
@@ -165,6 +268,14 @@ export declare class GroupedSelectQueryBuilder<TSelection, TOriginalRow, TGroupi
      * Create a mock GroupedItem for type inference
      */
     private createMockGroupedItem;
+    /**
+     * Detect navigation property references in a WHERE condition and add necessary JOINs
+     */
+    private detectAndAddJoinsFromCondition;
+    /**
+     * Detect navigation properties in a selection and add JOINs for them
+     */
+    private detectAndAddJoinsFromSelection;
     /**
      * Build HAVING condition SQL - handles aggregate field refs specially
      */
@@ -182,5 +293,71 @@ export declare class GroupedSelectQueryBuilder<TSelection, TOriginalRow, TGroupi
      */
     private getOperatorForCondition;
 }
+/**
+ * Query builder for grouped queries that have been joined
+ * This handles the case where a GroupedSelectQueryBuilder is joined with a CTE or subquery
+ */
+export declare class GroupedJoinedQueryBuilder<TSelection, TLeft, TRight> {
+    private schema;
+    private client;
+    private leftSubquery;
+    private leftAlias;
+    private rightSource;
+    private rightAlias;
+    private joinType;
+    private joinCondition;
+    private resultSelector;
+    private createLeftMock;
+    private createRightMock;
+    private executor?;
+    private cte?;
+    private limitValue?;
+    private offsetValue?;
+    private orderByFields;
+    private additionalJoins;
+    constructor(schema: TableSchema, client: DatabaseClient, leftSubquery: Subquery<any, 'table'>, leftAlias: string, rightSource: Subquery<TRight, 'table'> | DbCte<TRight>, rightAlias: string, joinType: JoinType, joinCondition: Condition, resultSelector: (left: TLeft, right: TRight) => TSelection, createLeftMock: () => TLeft, createRightMock: () => TRight, executor?: QueryExecutor, cte?: DbCte<TRight>);
+    /**
+     * Limit results
+     */
+    limit(count: number): this;
+    /**
+     * Offset results
+     */
+    offset(count: number): this;
+    /**
+     * Order by field(s) from the selected result
+     */
+    orderBy<T>(selector: (row: TSelection) => T): this;
+    orderBy<T>(selector: (row: TSelection) => T[]): this;
+    orderBy<T>(selector: (row: TSelection) => Array<[T, OrderDirection]>): this;
+    /**
+     * Execute query and return results
+     */
+    toList(): Promise<ResolveFieldRefs<TSelection>[]>;
+    /**
+     * Execute query and return first result or null
+     */
+    first(): Promise<ResolveFieldRefs<TSelection> | null>;
+    /**
+     * Execute query and return first result or throw
+     */
+    firstOrThrow(): Promise<ResolveFieldRefs<TSelection>>;
+    /**
+     * Convert to subquery for use in other queries
+     */
+    asSubquery<TMode extends 'scalar' | 'array' | 'table' = 'table'>(mode?: TMode): Subquery<TMode extends 'scalar' ? ResolveFieldRefs<TSelection> : TMode extends 'array' ? ResolveFieldRefs<TSelection>[] : ResolveFieldRefs<TSelection>, TMode>;
+    /**
+     * Build SQL for use in CTEs - public interface for CTE builder
+     * @internal
+     */
+    buildCteQuery(queryContext: QueryContext): {
+        sql: string;
+        params: any[];
+    };
+    /**
+     * Build the SQL query
+     */
+    private buildQuery;
+}
 export {};
 //# sourceMappingURL=grouped-query.d.ts.map