metal-orm 1.0.17 → 1.0.18

package/dist/{select-BPCn6MOH.d.cts → select-BuMpVcVt.d.cts}

@@ -1,7 +1,7 @@
 /**
  * Supported column data types for database schema definitions
  */
-type ColumnType = 'INT' | 'INTEGER' | 'BIGINT' | 'VARCHAR' | 'TEXT' | 'JSON' | 'ENUM' | 'DECIMAL' | 'FLOAT' | 'DOUBLE' | 'UUID' | 'DATE' | 'DATETIME' | 'TIMESTAMP' | 'TIMESTAMPTZ' | 'BOOLEAN' | 'int' | 'integer' | 'bigint' | 'varchar' | 'text' | 'json' | 'enum' | 'decimal' | 'float' | 'double' | 'uuid' | 'date' | 'datetime' | 'timestamp' | 'timestamptz' | 'boolean';
+type ColumnType = 'INT' | 'INTEGER' | 'BIGINT' | 'VARCHAR' | 'TEXT' | 'JSON' | 'ENUM' | 'DECIMAL' | 'FLOAT' | 'DOUBLE' | 'UUID' | 'BINARY' | 'VARBINARY' | 'BLOB' | 'BYTEA' | 'DATE' | 'DATETIME' | 'TIMESTAMP' | 'TIMESTAMPTZ' | 'BOOLEAN' | 'int' | 'integer' | 'bigint' | 'varchar' | 'text' | 'json' | 'enum' | 'decimal' | 'float' | 'double' | 'uuid' | 'binary' | 'varbinary' | 'blob' | 'bytea' | 'date' | 'datetime' | 'timestamp' | 'timestamptz' | 'boolean';
 type ReferentialAction = 'NO ACTION' | 'RESTRICT' | 'CASCADE' | 'SET NULL' | 'SET DEFAULT';
 interface RawDefaultValue {
     raw: string;
@@ -83,6 +83,22 @@ declare const col: {
      * Creates a UUID column definition
      */
     uuid: () => ColumnDef<"UUID">;
+    /**
+     * Creates a binary large object column definition
+     */
+    blob: () => ColumnDef<"BLOB">;
+    /**
+     * Creates a fixed-length binary column definition
+     */
+    binary: (length?: number) => ColumnDef<"BINARY">;
+    /**
+     * Creates a variable-length binary column definition
+     */
+    varbinary: (length?: number) => ColumnDef<"VARBINARY">;
+    /**
+     * Creates a Postgres bytea column definition
+     */
+    bytea: () => ColumnDef<"BYTEA">;
     /**
      * Creates a timestamp column definition
      */
@@ -355,7 +371,7 @@ type RelationTargetTable<TRel extends RelationDef> = TRel extends HasManyRelatio
 /**
  * Maps a ColumnDef to its TypeScript type representation
  */
-type ColumnToTs<T extends ColumnDef> = T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string;
+type ColumnToTs<T extends ColumnDef> = T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string;
 /**
  * Infers a row shape from a table definition
  */
@@ -534,6 +550,8 @@ interface ColumnNode {
     name: string;
     /** Optional alias for the column */
     alias?: string;
+    /** Optional scope marker (e.g., 'outer' for correlated references) */
+    scope?: 'outer' | 'default';
 }
 /**
  * AST node representing a function call
@@ -700,7 +718,7 @@ interface JoinNode {
     /** Type of join (INNER, LEFT, RIGHT, etc.) */
     kind: JoinKind;
     /** Table to join */
-    table: TableNode | FunctionTableNode;
+    table: TableSourceNode;
     /** Join condition expression */
     condition: ExpressionNode;
     /** Optional metadata for non-SQL concerns (e.g., relation name) */
@@ -739,6 +757,19 @@ interface FunctionTableNode {
     /** Optional column aliases */
     columnAliases?: string[];
 }
+/**
+ * AST node representing a derived table (subquery with an alias)
+ */
+interface DerivedTableNode {
+    type: 'DerivedTable';
+    /** Subquery providing the rows */
+    query: SelectQueryNode;
+    /** Required alias for the derived table */
+    alias: string;
+    /** Optional column aliases */
+    columnAliases?: string[];
+}
+type TableSourceNode = TableNode | FunctionTableNode | DerivedTableNode;
 /**
  * AST node representing an ORDER BY clause
  */
@@ -785,7 +816,7 @@ interface SelectQueryNode {
     /** Optional CTEs (WITH clauses) */
     ctes?: CommonTableExpressionNode[];
     /** FROM clause table (either a Table or a FunctionTable) */
-    from: TableNode | FunctionTableNode;
+    from: TableSourceNode;
     /** SELECT clause columns */
     columns: (ColumnNode | FunctionNode | ScalarSubqueryNode | CaseExpressionNode | WindowFunctionNode)[];
     /** JOIN clauses */
@@ -1118,6 +1149,12 @@ declare class SelectQueryState {
      * @returns New SelectQueryState with added join
      */
     withJoin(join: JoinNode): SelectQueryState;
+    /**
+     * Replaces the FROM clause.
+     * @param from - Table source for the FROM clause
+     * @returns New SelectQueryState with updated FROM
+     */
+    withFrom(from: TableSourceNode): SelectQueryState;
     /**
      * Adds a WHERE clause to the query
      * @param predicate - WHERE predicate expression
@@ -1354,6 +1391,12 @@ declare class QueryAstService {
      * @returns Updated query state with set operation
      */
     withSetOperation(operator: SetOperationKind, query: SelectQueryNode): SelectQueryState;
+    /**
+     * Replaces the FROM clause for the current query.
+     * @param from - Table source to use in the FROM clause
+     * @returns Updated query state with new FROM
+     */
+    withFrom(from: TableSourceNode): SelectQueryState;
     /**
      * Selects a subquery as a column
      * @param alias - Alias for the subquery
@@ -1495,7 +1538,7 @@ declare class RelationService {
      * @param ast - Query AST to modify
      * @returns Modified query AST with relation correlation
      */
-    applyRelationCorrelation(relationName: string, ast: SelectQueryNode): SelectQueryNode;
+    applyRelationCorrelation(relationName: string, ast: SelectQueryNode, additionalCorrelation?: ExpressionNode): SelectQueryNode;
     /**
      * Creates a join node for a relation
      * @param state - Current query state
@@ -1526,6 +1569,7 @@ declare class RelationService {
      * @returns QueryAstService instance
      */
     private astService;
+    private rootTableName;
 }
 
 /**
@@ -1703,7 +1747,7 @@ interface NamingStrategy {
      * @param table - Table node, function table node, or name
      * @returns Valid TypeScript identifier
      */
-    tableToSymbol(table: TableNode | FunctionTableNode | string): string;
+    tableToSymbol(table: TableSourceNode | string): string;
     /**
      * Converts a column reference to a property name
      * @param column - Column node
@@ -1942,6 +1986,10 @@ type DeepSelectConfig<TTable extends TableDef> = {
 } & {
     [K in keyof TTable['relations'] & string]?: (keyof RelationTargetTable<TTable['relations'][K]>['columns'] & string)[];
 };
+type WhereHasOptions = {
+    correlate?: ExpressionNode;
+};
+type RelationCallback = <TChildTable extends TableDef>(qb: SelectQueryBuilder<any, TChildTable>) => SelectQueryBuilder<any, TChildTable>;
 /**
 
  * Main query builder class for constructing SQL SELECT queries
@@ -1972,7 +2020,13 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      */
     constructor(table: TTable, state?: SelectQueryState, hydration?: HydrationManager, dependencies?: Partial<SelectQueryBuilderDependencies>, lazyRelations?: Set<string>);
     private clone;
+    /**
+     * Applies an alias to the root FROM table.
+     * @param alias - Alias to apply
+     */
+    as(alias: string): SelectQueryBuilder<T, TTable>;
     private resolveQueryNode;
+    private applyCorrelation;
     private createChildBuilder;
     private applyAst;
     private applyJoin;
@@ -2030,6 +2084,14 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
   
      */
     withRecursive(name: string, query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable>;
+    /**
+     * Replaces the FROM clause with a derived table (subquery with alias)
+     * @param subquery - Subquery to use as the FROM source
+     * @param alias - Alias for the derived table
+     * @param columnAliases - Optional column alias list
+     * @returns New query builder instance with updated FROM
+     */
+    fromSubquery(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, alias: string, columnAliases?: string[]): SelectQueryBuilder<T, TTable>;
     /**
   
      * Selects a subquery as a column
@@ -2042,6 +2104,16 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
   
      */
     selectSubquery(alias: string, sub: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable>;
+    /**
+     * Adds a JOIN against a derived table (subquery with alias)
+     * @param subquery - Subquery to join
+     * @param alias - Alias for the derived table
+     * @param condition - Join condition expression
+     * @param joinKind - Join kind (defaults to INNER)
+     * @param columnAliases - Optional column alias list for the derived table
+     * @returns New query builder instance with the derived-table join
+     */
+    joinSubquery(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, alias: string, condition: BinaryExpressionNode, joinKind?: JoinKind, columnAliases?: string[]): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds an INNER JOIN to the query
@@ -2254,7 +2326,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the WHERE EXISTS condition
   
      */
-    whereExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable>;
+    whereExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, correlate?: ExpressionNode): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds a WHERE NOT EXISTS condition to the query
@@ -2264,7 +2336,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the WHERE NOT EXISTS condition
   
      */
-    whereNotExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable>;
+    whereNotExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, correlate?: ExpressionNode): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds a WHERE EXISTS condition based on a relationship
@@ -2276,7 +2348,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the relationship existence check
   
      */
-    whereHas(relationName: string, callback?: <TChildTable extends TableDef>(qb: SelectQueryBuilder<any, TChildTable>) => SelectQueryBuilder<any, TChildTable>): SelectQueryBuilder<T, TTable>;
+    whereHas(relationName: string, callbackOrOptions?: RelationCallback | WhereHasOptions, maybeOptions?: WhereHasOptions): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds a WHERE NOT EXISTS condition based on a relationship
@@ -2288,7 +2360,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the relationship non-existence check
   
      */
-    whereHasNot(relationName: string, callback?: <TChildTable extends TableDef>(qb: SelectQueryBuilder<any, TChildTable>) => SelectQueryBuilder<any, TChildTable>): SelectQueryBuilder<T, TTable>;
+    whereHasNot(relationName: string, callbackOrOptions?: RelationCallback | WhereHasOptions, maybeOptions?: WhereHasOptions): SelectQueryBuilder<T, TTable>;
     /**
   
      * Compiles the query to SQL for a specific dialect
@@ -2349,4 +2421,4 @@ declare const createColumn: (table: string, name: string) => ColumnNode;
  */
 declare const createLiteral: (val: string | number) => LiteralNode;
 
-export { type TableHooks as $, type BelongsToRelation as A, type BinaryExpressionNode as B, type ColumnRef as C, Dialect as D, type ExpressionNode as E, type FunctionNode as F, type BelongsToManyRelation as G, type HydrationPlan as H, type InExpressionNode as I, type JsonPathNode as J, type HasManyCollection as K, type LiteralNode as L, type BelongsToReference as M, type NullExpressionNode as N, type OperandNode as O, type ManyToManyCollection as P, OrmSession as Q, type RelationMap as R, type SelectQueryNode as S, type TableRef as T, type UpdateQueryNode as U, SelectQueryBuilder as V, type WindowFunctionNode as W, type ExecutionContext as X, type HydrationContext as Y, type CheckConstraint as Z, type TableOptions as _, type ColumnNode as a, defineTable as a0, type ColumnType as a1, type ReferentialAction as a2, type RawDefaultValue as a3, type DefaultValue as a4, col as a5, RelationKinds as a6, type RelationType as a7, type CascadeMode as a8, type RelationDef as a9, DomainEventBus as aA, addDomainEvent as aB, EntityStatus as aC, type TrackedEntity as aD, type RelationKey as aE, type RelationChange as aF, type RelationChangeEntry as aG, type DomainEvent as aH, type AnyDomainEvent as aI, type OrmDomainEvent as aJ, type HasDomainEvents as aK, type QueryLogEntry as aL, type QueryLogger as aM, createQueryLoggingExecutor as aN, type QueryResult as aO, rowsToQueryResult as aP, type SimpleQueryRunner as aQ, createExecutorFromQueryRunner as aR, type EntityOrTableTargetResolver as aS, type EntityConstructor as aT, hasMany as aa, hasOne as ab, belongsTo as ac, belongsToMany as ad, type RelationTargetTable as ae, type ColumnToTs as af, type InferRow as ag, type HasOneReference as ah, createColumn as ai, createLiteral as aj, isOperandNode as ak, isFunctionNode as al, isCaseExpressionNode as am, isWindowFunctionNode as an, isExpressionSelectionNode as ao, type HydrationPivotPlan as ap, type HydrationRelationPlan as aq, type HydrationMetadata as ar, type OrmInterceptor as as, type OrmSessionOptions as at, type OrmOptions as au, type DbExecutorFactory as av, type ExternalTransaction as aw, Orm as ax, type DomainEventHandler as ay, type InitialHandlers as az, type LogicalExpressionNode as b, type BetweenExpressionNode as c, type CaseExpressionNode as d, type ExistsExpressionNode as e, type OrderDirection as f, type ScalarSubqueryNode as g, type ColumnDef as h, type TableDef as i, type InsertQueryNode as j, type InsertCompiler as k, type CompiledQuery as l, type DialectKey as m, type UpdateCompiler as n, type DeleteQueryNode as o, type DeleteCompiler as p, type CompilerContext as q, type ForeignKeyReference as r, type IndexColumn as s, type IndexDef as t, type DbExecutor as u, type NamingStrategy as v, type EntityContext as w, type Entity as x, type HasManyRelation as y, type HasOneRelation as z };
+export { type HydrationContext as $, type Entity as A, type BinaryExpressionNode as B, type ColumnRef as C, Dialect as D, type ExpressionNode as E, type FunctionNode as F, type HasManyRelation as G, type HydrationPlan as H, type InExpressionNode as I, type JsonPathNode as J, type HasOneRelation as K, type LiteralNode as L, type BelongsToRelation as M, type NullExpressionNode as N, type OperandNode as O, type BelongsToManyRelation as P, type HasManyCollection as Q, type RelationMap as R, type SelectQueryNode as S, type TableRef as T, type UpdateQueryNode as U, type BelongsToReference as V, type WindowFunctionNode as W, type ManyToManyCollection as X, OrmSession as Y, SelectQueryBuilder as Z, type ExecutionContext as _, type ColumnNode as a, type CheckConstraint as a0, type TableOptions as a1, type TableHooks as a2, defineTable as a3, type ColumnType as a4, type ReferentialAction as a5, type RawDefaultValue as a6, type DefaultValue as a7, col as a8, RelationKinds as a9, Orm as aA, type DomainEventHandler as aB, type InitialHandlers as aC, DomainEventBus as aD, addDomainEvent as aE, EntityStatus as aF, type TrackedEntity as aG, type RelationKey as aH, type RelationChange as aI, type RelationChangeEntry as aJ, type DomainEvent as aK, type AnyDomainEvent as aL, type OrmDomainEvent as aM, type HasDomainEvents as aN, type QueryLogEntry as aO, type QueryLogger as aP, createQueryLoggingExecutor as aQ, type QueryResult as aR, rowsToQueryResult as aS, type SimpleQueryRunner as aT, createExecutorFromQueryRunner as aU, type EntityOrTableTargetResolver as aV, type EntityConstructor as aW, type RelationType as aa, type CascadeMode as ab, type RelationDef as ac, hasMany as ad, hasOne as ae, belongsTo as af, belongsToMany as ag, type RelationTargetTable as ah, type ColumnToTs as ai, type InferRow as aj, type HasOneReference as ak, createColumn as al, createLiteral as am, isOperandNode as an, isFunctionNode as ao, isCaseExpressionNode as ap, isWindowFunctionNode as aq, isExpressionSelectionNode as ar, type HydrationPivotPlan as as, type HydrationRelationPlan as at, type HydrationMetadata as au, type OrmInterceptor as av, type OrmSessionOptions as aw, type OrmOptions as ax, type DbExecutorFactory as ay, type ExternalTransaction as az, type LogicalExpressionNode as b, type BetweenExpressionNode as c, type CaseExpressionNode as d, type ExistsExpressionNode as e, type OrderDirection as f, type ScalarSubqueryNode as g, type ColumnDef as h, type TableDef as i, type InsertQueryNode as j, type InsertCompiler as k, type CompiledQuery as l, type DialectKey as m, type UpdateCompiler as n, type DeleteQueryNode as o, type DeleteCompiler as p, type CompilerContext as q, type FunctionTableNode as r, type DerivedTableNode as s, type TableSourceNode as t, type ForeignKeyReference as u, type IndexColumn as v, type IndexDef as w, type DbExecutor as x, type NamingStrategy as y, type EntityContext as z };

package/dist/{select-BPCn6MOH.d.ts → select-BuMpVcVt.d.ts}

@@ -1,7 +1,7 @@
 /**
  * Supported column data types for database schema definitions
  */
-type ColumnType = 'INT' | 'INTEGER' | 'BIGINT' | 'VARCHAR' | 'TEXT' | 'JSON' | 'ENUM' | 'DECIMAL' | 'FLOAT' | 'DOUBLE' | 'UUID' | 'DATE' | 'DATETIME' | 'TIMESTAMP' | 'TIMESTAMPTZ' | 'BOOLEAN' | 'int' | 'integer' | 'bigint' | 'varchar' | 'text' | 'json' | 'enum' | 'decimal' | 'float' | 'double' | 'uuid' | 'date' | 'datetime' | 'timestamp' | 'timestamptz' | 'boolean';
+type ColumnType = 'INT' | 'INTEGER' | 'BIGINT' | 'VARCHAR' | 'TEXT' | 'JSON' | 'ENUM' | 'DECIMAL' | 'FLOAT' | 'DOUBLE' | 'UUID' | 'BINARY' | 'VARBINARY' | 'BLOB' | 'BYTEA' | 'DATE' | 'DATETIME' | 'TIMESTAMP' | 'TIMESTAMPTZ' | 'BOOLEAN' | 'int' | 'integer' | 'bigint' | 'varchar' | 'text' | 'json' | 'enum' | 'decimal' | 'float' | 'double' | 'uuid' | 'binary' | 'varbinary' | 'blob' | 'bytea' | 'date' | 'datetime' | 'timestamp' | 'timestamptz' | 'boolean';
 type ReferentialAction = 'NO ACTION' | 'RESTRICT' | 'CASCADE' | 'SET NULL' | 'SET DEFAULT';
 interface RawDefaultValue {
     raw: string;
@@ -83,6 +83,22 @@ declare const col: {
      * Creates a UUID column definition
      */
     uuid: () => ColumnDef<"UUID">;
+    /**
+     * Creates a binary large object column definition
+     */
+    blob: () => ColumnDef<"BLOB">;
+    /**
+     * Creates a fixed-length binary column definition
+     */
+    binary: (length?: number) => ColumnDef<"BINARY">;
+    /**
+     * Creates a variable-length binary column definition
+     */
+    varbinary: (length?: number) => ColumnDef<"VARBINARY">;
+    /**
+     * Creates a Postgres bytea column definition
+     */
+    bytea: () => ColumnDef<"BYTEA">;
     /**
      * Creates a timestamp column definition
      */
@@ -355,7 +371,7 @@ type RelationTargetTable<TRel extends RelationDef> = TRel extends HasManyRelatio
 /**
  * Maps a ColumnDef to its TypeScript type representation
  */
-type ColumnToTs<T extends ColumnDef> = T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string;
+type ColumnToTs<T extends ColumnDef> = T['type'] extends 'INT' | 'INTEGER' | 'int' | 'integer' ? number : T['type'] extends 'BIGINT' | 'bigint' ? number | bigint : T['type'] extends 'DECIMAL' | 'decimal' | 'FLOAT' | 'float' | 'DOUBLE' | 'double' ? number : T['type'] extends 'BOOLEAN' | 'boolean' ? boolean : T['type'] extends 'JSON' | 'json' ? unknown : T['type'] extends 'BLOB' | 'blob' | 'BINARY' | 'binary' | 'VARBINARY' | 'varbinary' | 'BYTEA' | 'bytea' ? Buffer : T['type'] extends 'DATE' | 'date' | 'DATETIME' | 'datetime' | 'TIMESTAMP' | 'timestamp' | 'TIMESTAMPTZ' | 'timestamptz' ? string : string;
 /**
  * Infers a row shape from a table definition
  */
@@ -534,6 +550,8 @@ interface ColumnNode {
     name: string;
     /** Optional alias for the column */
     alias?: string;
+    /** Optional scope marker (e.g., 'outer' for correlated references) */
+    scope?: 'outer' | 'default';
 }
 /**
  * AST node representing a function call
@@ -700,7 +718,7 @@ interface JoinNode {
     /** Type of join (INNER, LEFT, RIGHT, etc.) */
     kind: JoinKind;
     /** Table to join */
-    table: TableNode | FunctionTableNode;
+    table: TableSourceNode;
     /** Join condition expression */
     condition: ExpressionNode;
     /** Optional metadata for non-SQL concerns (e.g., relation name) */
@@ -739,6 +757,19 @@ interface FunctionTableNode {
     /** Optional column aliases */
     columnAliases?: string[];
 }
+/**
+ * AST node representing a derived table (subquery with an alias)
+ */
+interface DerivedTableNode {
+    type: 'DerivedTable';
+    /** Subquery providing the rows */
+    query: SelectQueryNode;
+    /** Required alias for the derived table */
+    alias: string;
+    /** Optional column aliases */
+    columnAliases?: string[];
+}
+type TableSourceNode = TableNode | FunctionTableNode | DerivedTableNode;
 /**
  * AST node representing an ORDER BY clause
  */
@@ -785,7 +816,7 @@ interface SelectQueryNode {
     /** Optional CTEs (WITH clauses) */
     ctes?: CommonTableExpressionNode[];
     /** FROM clause table (either a Table or a FunctionTable) */
-    from: TableNode | FunctionTableNode;
+    from: TableSourceNode;
     /** SELECT clause columns */
     columns: (ColumnNode | FunctionNode | ScalarSubqueryNode | CaseExpressionNode | WindowFunctionNode)[];
     /** JOIN clauses */
@@ -1118,6 +1149,12 @@ declare class SelectQueryState {
      * @returns New SelectQueryState with added join
      */
     withJoin(join: JoinNode): SelectQueryState;
+    /**
+     * Replaces the FROM clause.
+     * @param from - Table source for the FROM clause
+     * @returns New SelectQueryState with updated FROM
+     */
+    withFrom(from: TableSourceNode): SelectQueryState;
     /**
      * Adds a WHERE clause to the query
      * @param predicate - WHERE predicate expression
@@ -1354,6 +1391,12 @@ declare class QueryAstService {
      * @returns Updated query state with set operation
      */
     withSetOperation(operator: SetOperationKind, query: SelectQueryNode): SelectQueryState;
+    /**
+     * Replaces the FROM clause for the current query.
+     * @param from - Table source to use in the FROM clause
+     * @returns Updated query state with new FROM
+     */
+    withFrom(from: TableSourceNode): SelectQueryState;
     /**
      * Selects a subquery as a column
      * @param alias - Alias for the subquery
@@ -1495,7 +1538,7 @@ declare class RelationService {
      * @param ast - Query AST to modify
      * @returns Modified query AST with relation correlation
      */
-    applyRelationCorrelation(relationName: string, ast: SelectQueryNode): SelectQueryNode;
+    applyRelationCorrelation(relationName: string, ast: SelectQueryNode, additionalCorrelation?: ExpressionNode): SelectQueryNode;
     /**
      * Creates a join node for a relation
      * @param state - Current query state
@@ -1526,6 +1569,7 @@ declare class RelationService {
      * @returns QueryAstService instance
      */
     private astService;
+    private rootTableName;
 }
 
 /**
@@ -1703,7 +1747,7 @@ interface NamingStrategy {
      * @param table - Table node, function table node, or name
      * @returns Valid TypeScript identifier
      */
-    tableToSymbol(table: TableNode | FunctionTableNode | string): string;
+    tableToSymbol(table: TableSourceNode | string): string;
     /**
      * Converts a column reference to a property name
      * @param column - Column node
@@ -1942,6 +1986,10 @@ type DeepSelectConfig<TTable extends TableDef> = {
 } & {
     [K in keyof TTable['relations'] & string]?: (keyof RelationTargetTable<TTable['relations'][K]>['columns'] & string)[];
 };
+type WhereHasOptions = {
+    correlate?: ExpressionNode;
+};
+type RelationCallback = <TChildTable extends TableDef>(qb: SelectQueryBuilder<any, TChildTable>) => SelectQueryBuilder<any, TChildTable>;
 /**
 
  * Main query builder class for constructing SQL SELECT queries
@@ -1972,7 +2020,13 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      */
     constructor(table: TTable, state?: SelectQueryState, hydration?: HydrationManager, dependencies?: Partial<SelectQueryBuilderDependencies>, lazyRelations?: Set<string>);
     private clone;
+    /**
+     * Applies an alias to the root FROM table.
+     * @param alias - Alias to apply
+     */
+    as(alias: string): SelectQueryBuilder<T, TTable>;
     private resolveQueryNode;
+    private applyCorrelation;
     private createChildBuilder;
     private applyAst;
     private applyJoin;
@@ -2030,6 +2084,14 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
   
      */
     withRecursive(name: string, query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable>;
+    /**
+     * Replaces the FROM clause with a derived table (subquery with alias)
+     * @param subquery - Subquery to use as the FROM source
+     * @param alias - Alias for the derived table
+     * @param columnAliases - Optional column alias list
+     * @returns New query builder instance with updated FROM
+     */
+    fromSubquery(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, alias: string, columnAliases?: string[]): SelectQueryBuilder<T, TTable>;
     /**
   
      * Selects a subquery as a column
@@ -2042,6 +2104,16 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
   
      */
     selectSubquery(alias: string, sub: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable>;
+    /**
+     * Adds a JOIN against a derived table (subquery with alias)
+     * @param subquery - Subquery to join
+     * @param alias - Alias for the derived table
+     * @param condition - Join condition expression
+     * @param joinKind - Join kind (defaults to INNER)
+     * @param columnAliases - Optional column alias list for the derived table
+     * @returns New query builder instance with the derived-table join
+     */
+    joinSubquery(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, alias: string, condition: BinaryExpressionNode, joinKind?: JoinKind, columnAliases?: string[]): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds an INNER JOIN to the query
@@ -2254,7 +2326,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the WHERE EXISTS condition
   
      */
-    whereExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable>;
+    whereExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, correlate?: ExpressionNode): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds a WHERE NOT EXISTS condition to the query
@@ -2264,7 +2336,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the WHERE NOT EXISTS condition
   
      */
-    whereNotExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable>;
+    whereNotExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, correlate?: ExpressionNode): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds a WHERE EXISTS condition based on a relationship
@@ -2276,7 +2348,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the relationship existence check
   
      */
-    whereHas(relationName: string, callback?: <TChildTable extends TableDef>(qb: SelectQueryBuilder<any, TChildTable>) => SelectQueryBuilder<any, TChildTable>): SelectQueryBuilder<T, TTable>;
+    whereHas(relationName: string, callbackOrOptions?: RelationCallback | WhereHasOptions, maybeOptions?: WhereHasOptions): SelectQueryBuilder<T, TTable>;
     /**
   
      * Adds a WHERE NOT EXISTS condition based on a relationship
@@ -2288,7 +2360,7 @@ declare class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
      * @returns New query builder instance with the relationship non-existence check
   
      */
-    whereHasNot(relationName: string, callback?: <TChildTable extends TableDef>(qb: SelectQueryBuilder<any, TChildTable>) => SelectQueryBuilder<any, TChildTable>): SelectQueryBuilder<T, TTable>;
+    whereHasNot(relationName: string, callbackOrOptions?: RelationCallback | WhereHasOptions, maybeOptions?: WhereHasOptions): SelectQueryBuilder<T, TTable>;
     /**
   
      * Compiles the query to SQL for a specific dialect
@@ -2349,4 +2421,4 @@ declare const createColumn: (table: string, name: string) => ColumnNode;
  */
 declare const createLiteral: (val: string | number) => LiteralNode;
 
-export { type TableHooks as $, type BelongsToRelation as A, type BinaryExpressionNode as B, type ColumnRef as C, Dialect as D, type ExpressionNode as E, type FunctionNode as F, type BelongsToManyRelation as G, type HydrationPlan as H, type InExpressionNode as I, type JsonPathNode as J, type HasManyCollection as K, type LiteralNode as L, type BelongsToReference as M, type NullExpressionNode as N, type OperandNode as O, type ManyToManyCollection as P, OrmSession as Q, type RelationMap as R, type SelectQueryNode as S, type TableRef as T, type UpdateQueryNode as U, SelectQueryBuilder as V, type WindowFunctionNode as W, type ExecutionContext as X, type HydrationContext as Y, type CheckConstraint as Z, type TableOptions as _, type ColumnNode as a, defineTable as a0, type ColumnType as a1, type ReferentialAction as a2, type RawDefaultValue as a3, type DefaultValue as a4, col as a5, RelationKinds as a6, type RelationType as a7, type CascadeMode as a8, type RelationDef as a9, DomainEventBus as aA, addDomainEvent as aB, EntityStatus as aC, type TrackedEntity as aD, type RelationKey as aE, type RelationChange as aF, type RelationChangeEntry as aG, type DomainEvent as aH, type AnyDomainEvent as aI, type OrmDomainEvent as aJ, type HasDomainEvents as aK, type QueryLogEntry as aL, type QueryLogger as aM, createQueryLoggingExecutor as aN, type QueryResult as aO, rowsToQueryResult as aP, type SimpleQueryRunner as aQ, createExecutorFromQueryRunner as aR, type EntityOrTableTargetResolver as aS, type EntityConstructor as aT, hasMany as aa, hasOne as ab, belongsTo as ac, belongsToMany as ad, type RelationTargetTable as ae, type ColumnToTs as af, type InferRow as ag, type HasOneReference as ah, createColumn as ai, createLiteral as aj, isOperandNode as ak, isFunctionNode as al, isCaseExpressionNode as am, isWindowFunctionNode as an, isExpressionSelectionNode as ao, type HydrationPivotPlan as ap, type HydrationRelationPlan as aq, type HydrationMetadata as ar, type OrmInterceptor as as, type OrmSessionOptions as at, type OrmOptions as au, type DbExecutorFactory as av, type ExternalTransaction as aw, Orm as ax, type DomainEventHandler as ay, type InitialHandlers as az, type LogicalExpressionNode as b, type BetweenExpressionNode as c, type CaseExpressionNode as d, type ExistsExpressionNode as e, type OrderDirection as f, type ScalarSubqueryNode as g, type ColumnDef as h, type TableDef as i, type InsertQueryNode as j, type InsertCompiler as k, type CompiledQuery as l, type DialectKey as m, type UpdateCompiler as n, type DeleteQueryNode as o, type DeleteCompiler as p, type CompilerContext as q, type ForeignKeyReference as r, type IndexColumn as s, type IndexDef as t, type DbExecutor as u, type NamingStrategy as v, type EntityContext as w, type Entity as x, type HasManyRelation as y, type HasOneRelation as z };
+export { type HydrationContext as $, type Entity as A, type BinaryExpressionNode as B, type ColumnRef as C, Dialect as D, type ExpressionNode as E, type FunctionNode as F, type HasManyRelation as G, type HydrationPlan as H, type InExpressionNode as I, type JsonPathNode as J, type HasOneRelation as K, type LiteralNode as L, type BelongsToRelation as M, type NullExpressionNode as N, type OperandNode as O, type BelongsToManyRelation as P, type HasManyCollection as Q, type RelationMap as R, type SelectQueryNode as S, type TableRef as T, type UpdateQueryNode as U, type BelongsToReference as V, type WindowFunctionNode as W, type ManyToManyCollection as X, OrmSession as Y, SelectQueryBuilder as Z, type ExecutionContext as _, type ColumnNode as a, type CheckConstraint as a0, type TableOptions as a1, type TableHooks as a2, defineTable as a3, type ColumnType as a4, type ReferentialAction as a5, type RawDefaultValue as a6, type DefaultValue as a7, col as a8, RelationKinds as a9, Orm as aA, type DomainEventHandler as aB, type InitialHandlers as aC, DomainEventBus as aD, addDomainEvent as aE, EntityStatus as aF, type TrackedEntity as aG, type RelationKey as aH, type RelationChange as aI, type RelationChangeEntry as aJ, type DomainEvent as aK, type AnyDomainEvent as aL, type OrmDomainEvent as aM, type HasDomainEvents as aN, type QueryLogEntry as aO, type QueryLogger as aP, createQueryLoggingExecutor as aQ, type QueryResult as aR, rowsToQueryResult as aS, type SimpleQueryRunner as aT, createExecutorFromQueryRunner as aU, type EntityOrTableTargetResolver as aV, type EntityConstructor as aW, type RelationType as aa, type CascadeMode as ab, type RelationDef as ac, hasMany as ad, hasOne as ae, belongsTo as af, belongsToMany as ag, type RelationTargetTable as ah, type ColumnToTs as ai, type InferRow as aj, type HasOneReference as ak, createColumn as al, createLiteral as am, isOperandNode as an, isFunctionNode as ao, isCaseExpressionNode as ap, isWindowFunctionNode as aq, isExpressionSelectionNode as ar, type HydrationPivotPlan as as, type HydrationRelationPlan as at, type HydrationMetadata as au, type OrmInterceptor as av, type OrmSessionOptions as aw, type OrmOptions as ax, type DbExecutorFactory as ay, type ExternalTransaction as az, type LogicalExpressionNode as b, type BetweenExpressionNode as c, type CaseExpressionNode as d, type ExistsExpressionNode as e, type OrderDirection as f, type ScalarSubqueryNode as g, type ColumnDef as h, type TableDef as i, type InsertQueryNode as j, type InsertCompiler as k, type CompiledQuery as l, type DialectKey as m, type UpdateCompiler as n, type DeleteQueryNode as o, type DeleteCompiler as p, type CompilerContext as q, type FunctionTableNode as r, type DerivedTableNode as s, type TableSourceNode as t, type ForeignKeyReference as u, type IndexColumn as v, type IndexDef as w, type DbExecutor as x, type NamingStrategy as y, type EntityContext as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metal-orm",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "type": "module",
   "exports": {
     ".": {
@@ -46,7 +46,10 @@
   },
   "devDependencies": {
     "@vitest/ui": "^4.0.14",
+    "mysql2": "^3.15.3",
+    "pg": "^8.16.3",
     "sqlite3": "^5.1.7",
+    "tedious": "^19.1.3",
     "tsup": "^8.0.0",
     "typescript": "^5.5.0",
     "vitest": "^4.0.14"

package/src/codegen/naming-strategy.ts

@@ -1,4 +1,4 @@
-import type { TableNode, FunctionTableNode } from '../core/ast/query.js';
+import type { TableNode, FunctionTableNode, DerivedTableNode, TableSourceNode } from '../core/ast/query.js';
 import type { ColumnNode } from '../core/ast/expression.js';
 
 /**
@@ -7,10 +7,10 @@ import type { ColumnNode } from '../core/ast/expression.js';
 export interface NamingStrategy {
   /**
    * Converts a table name to a TypeScript symbol name
-   * @param table - Table node, function table node, or name
-   * @returns Valid TypeScript identifier
-   */
-  tableToSymbol(table: TableNode | FunctionTableNode | string): string;
+   * @param table - Table node, function table node, or name
+   * @returns Valid TypeScript identifier
+   */
+  tableToSymbol(table: TableSourceNode | string): string;
 
   /**
    * Converts a column reference to a property name
@@ -27,11 +27,16 @@ export interface NamingStrategy {
 export class DefaultNamingStrategy implements NamingStrategy {
   /**
    * Converts table names to TypeScript symbols
-   * @param table - Table node, function table node, or string name
-   * @returns Capitalized table name (handles schema-qualified names)
-   */
-  tableToSymbol(table: TableNode | FunctionTableNode | string): string {
-    const tableName = typeof table === 'string' ? table : table.name;
+   * @param table - Table node, function table node, or string name
+   * @returns Capitalized table name (handles schema-qualified names)
+   */
+  tableToSymbol(table: TableNode | FunctionTableNode | DerivedTableNode | string): string {
+    const tableName =
+      typeof table === 'string'
+        ? table
+        : table.type === 'DerivedTable'
+          ? table.alias
+          : table.name;
 
     // Handle schema-qualified names (e.g., "auth.user" → "AuthUser")
     if (tableName.includes('.')) {

package/src/core/ast/builders.ts

@@ -1,5 +1,5 @@
 import { ColumnNode } from './expression-nodes.js';
-import { TableNode, FunctionTableNode } from './query.js';
+import { TableNode, FunctionTableNode, DerivedTableNode } from './query.js';
 import { ColumnRef, TableRef } from './types.js';
 
 /**
@@ -13,9 +13,15 @@ export const buildColumnNode = (table: TableRef, column: ColumnRef | ColumnNode)
   }
 
   const def = column as ColumnRef;
+  const baseTable = def.table
+    ? table.alias && def.table === table.name
+      ? table.alias
+      : def.table
+    : table.alias || table.name;
+
   return {
     type: 'Column',
-    table: def.table || table.name,
+    table: baseTable,
     name: def.name
   };
 };
@@ -28,7 +34,7 @@ export const buildColumnNode = (table: TableRef, column: ColumnRef | ColumnNode)
 export const buildColumnNodes = (table: TableRef, names: string[]): ColumnNode[] =>
   names.map(name => ({
     type: 'Column',
-    table: table.name,
+    table: table.alias || table.name,
     name
   }));
 
@@ -54,3 +60,17 @@ export const fnTable = (name: string, args: any[] = [], alias?: string, opts?: {
   columnAliases: opts?.columnAliases,
   schema: opts?.schema
 });
+
+/**
+ * Creates a derived table node wrapping a subquery.
+ */
+export const derivedTable = (
+  query: import('./query.js').SelectQueryNode,
+  alias: string,
+  columnAliases?: string[]
+): DerivedTableNode => ({
+  type: 'DerivedTable',
+  query,
+  alias,
+  columnAliases
+});

package/src/core/ast/expression-builders.ts

@@ -63,7 +63,20 @@ const toOperand = (val: OperandNode | ColumnRef | LiteralValue): OperandNode =>
   return toNode(val);
 };
 
-export const columnOperand = (col: ColumnRef | ColumnNode): ColumnNode => toNode(col) as ColumnNode;
+export const columnOperand = (col: ColumnRef | ColumnNode): ColumnNode => toNode(col) as ColumnNode;
+/**
+ * Marks a column reference as an outer-scope reference for correlated subqueries.
+ * Primarily semantic; SQL rendering still uses the provided table/alias name.
+ */
+export const outerRef = (col: ColumnRef | ColumnNode): ColumnNode => ({
+  ...columnOperand(col),
+  scope: 'outer'
+});
+
+/**
+ * Creates an outer-scoped column reference using a specific table or alias name.
+ */
+export const correlateBy = (table: string, column: string): ColumnNode => outerRef({ name: column, table });
 
 const createBinaryExpression = (
   operator: SqlOperator,