metal-orm 1.0.17 → 1.0.18

package/src/query-builder/select.ts

@@ -6,27 +6,30 @@ import { SelectQueryNode, SetOperationKind } from '../core/ast/query.js';
 
 import { HydrationPlan } from '../core/hydration/types.js';
 
-import {
-
-  ColumnNode,
-
-  ExpressionNode,
-
-  FunctionNode,
-
-  LiteralNode,
-
-  BinaryExpressionNode,
-
-  CaseExpressionNode,
-
-  WindowFunctionNode,
-
-  exists,
-
-  notExists
-
-} from '../core/ast/expression.js';
+import {
+
+  ColumnNode,
+
+  ExpressionNode,
+
+  FunctionNode,
+
+  LiteralNode,
+
+  BinaryExpressionNode,
+
+  CaseExpressionNode,
+
+  WindowFunctionNode,
+
+  and,
+
+  exists,
+
+  notExists
+
+} from '../core/ast/expression.js';
+import { derivedTable } from '../core/ast/builders.js';
 
 import { CompiledQuery, Dialect } from '../core/dialect/abstract.js';
 
@@ -87,6 +90,14 @@ type DeepSelectConfig<TTable extends TableDef> = {
   )[];
 };
 
+type WhereHasOptions = {
+  correlate?: ExpressionNode;
+};
+
+type RelationCallback = <TChildTable extends TableDef>(
+  qb: SelectQueryBuilder<any, TChildTable>
+) => SelectQueryBuilder<any, TChildTable>;
+
 
 /**
 
@@ -166,29 +177,52 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
 
 
-  private clone(
-
-    context: SelectQueryBuilderContext = this.context,
-
-    lazyRelations = new Set(this.lazyRelations)
-
-  ): SelectQueryBuilder<T, TTable> {
-
-    return new SelectQueryBuilder(this.env.table as TTable, context.state, context.hydration, this.env.deps, lazyRelations);
-
-  }
-
-
-
-  private resolveQueryNode(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryNode {
-
-    return typeof (query as any).getAST === 'function'
+  private clone(
+
+    context: SelectQueryBuilderContext = this.context,
+
+    lazyRelations = new Set(this.lazyRelations)
+
+  ): SelectQueryBuilder<T, TTable> {
+
+    return new SelectQueryBuilder(this.env.table as TTable, context.state, context.hydration, this.env.deps, lazyRelations);
+
+  }
+
+  /**
+   * Applies an alias to the root FROM table.
+   * @param alias - Alias to apply
+   */
+  as(alias: string): SelectQueryBuilder<T, TTable> {
+    const from = this.context.state.ast.from;
+    if (from.type !== 'Table') {
+      throw new Error('Cannot alias non-table FROM sources');
+    }
+    const nextFrom = { ...from, alias };
+    const nextContext = this.applyAst(this.context, service => service.withFrom(nextFrom));
+    return this.clone(nextContext);
+  }
 
-      ? (query as SelectQueryBuilder<any, TableDef<any>>).getAST()
 
-      : (query as SelectQueryNode);
 
-  }
+  private resolveQueryNode(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryNode {
+
+    return typeof (query as any).getAST === 'function'
+
+      ? (query as SelectQueryBuilder<any, TableDef<any>>).getAST()
+
+      : (query as SelectQueryNode);
+
+  }
+
+  private applyCorrelation(ast: SelectQueryNode, correlation?: ExpressionNode): SelectQueryNode {
+    if (!correlation) return ast;
+    const combinedWhere = ast.where ? and(correlation, ast.where) : correlation;
+    return {
+      ...ast,
+      where: combinedWhere
+    };
+  }
 
 
 
@@ -349,15 +383,34 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  withRecursive(name: string, query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable> {
-
-    const subAst = this.resolveQueryNode(query);
-
-    const nextContext = this.applyAst(this.context, service => service.withCte(name, subAst, columns, true));
-
-    return this.clone(nextContext);
-
-  }
+  withRecursive(name: string, query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable> {
+
+    const subAst = this.resolveQueryNode(query);
+
+    const nextContext = this.applyAst(this.context, service => service.withCte(name, subAst, columns, true));
+
+    return this.clone(nextContext);
+
+  }
+
+
+  /**
+   * 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> {
+    const subAst = this.resolveQueryNode(subquery);
+    const fromNode = derivedTable(subAst, alias, columnAliases);
+    const nextContext = this.applyAst(this.context, service => service.withFrom(fromNode));
+    return this.clone(nextContext);
+  }
 
 
 
@@ -373,14 +426,37 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  selectSubquery(alias: string, sub: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-
-    const query = this.resolveQueryNode(sub);
-
-    return this.clone(this.columnSelector.selectSubquery(this.context, alias, query));
-
-  }
-
+  selectSubquery(alias: string, sub: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+
+    const query = this.resolveQueryNode(sub);
+
+    return this.clone(this.columnSelector.selectSubquery(this.context, alias, query));
+
+  }
+
+
+  /**
+   * 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 = JOIN_KINDS.INNER,
+    columnAliases?: string[]
+  ): SelectQueryBuilder<T, TTable> {
+    const subAst = this.resolveQueryNode(subquery);
+    const joinNode = createJoinNode(joinKind, derivedTable(subAst, alias, columnAliases), condition);
+    const nextContext = this.applyAst(this.context, service => service.withJoin(joinNode));
+    return this.clone(nextContext);
+  }
+
 
 
   /**
@@ -852,13 +928,14 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  whereExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-
-    const subAst = this.resolveQueryNode(subquery);
-
-    return this.where(exists(subAst));
-
-  }
+  whereExists(
+    subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode,
+    correlate?: ExpressionNode
+  ): SelectQueryBuilder<T, TTable> {
+    const subAst = this.resolveQueryNode(subquery);
+    const correlated = this.applyCorrelation(subAst, correlate);
+    return this.where(exists(correlated));
+  }
 
 
 
@@ -872,13 +949,14 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  whereNotExists(subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-
-    const subAst = this.resolveQueryNode(subquery);
-
-    return this.where(notExists(subAst));
-
-  }
+  whereNotExists(
+    subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode,
+    correlate?: ExpressionNode
+  ): SelectQueryBuilder<T, TTable> {
+    const subAst = this.resolveQueryNode(subquery);
+    const correlated = this.applyCorrelation(subAst, correlate);
+    return this.where(notExists(correlated));
+  }
 
 
 
@@ -894,45 +972,46 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  whereHas(
-
-    relationName: string,
-
-    callback?: <TChildTable extends TableDef>(
-
-      qb: SelectQueryBuilder<any, TChildTable>
-
-    ) => SelectQueryBuilder<any, TChildTable>
-
-  ): SelectQueryBuilder<T, TTable> {
-
-    const relation = this.env.table.relations[relationName];
-
-    if (!relation) {
-
+  whereHas(
+
+    relationName: string,
+
+    callbackOrOptions?: RelationCallback | WhereHasOptions,
+
+    maybeOptions?: WhereHasOptions
+
+  ): SelectQueryBuilder<T, TTable> {
+
+    const relation = this.env.table.relations[relationName];
+
+    if (!relation) {
+
       throw new Error(`Relation '${relationName}' not found on table '${this.env.table.name}'`);
 
     }
 
 
 
-    let subQb = this.createChildBuilder<any, typeof relation.target>(relation.target);
-
-    if (callback) {
-
-      subQb = callback(subQb);
-
-    }
-
-
-
-    const subAst = subQb.getAST();
+    const callback = typeof callbackOrOptions === 'function' ? callbackOrOptions as RelationCallback : undefined;
+    const options = (typeof callbackOrOptions === 'function' ? maybeOptions : callbackOrOptions) as WhereHasOptions | undefined;
+
+    let subQb = this.createChildBuilder<any, typeof relation.target>(relation.target);
+
+    if (callback) {
+
+      subQb = callback(subQb);
+
+    }
 
-    const finalSubAst = this.relationManager.applyRelationCorrelation(this.context, relationName, subAst);
 
-    return this.where(exists(finalSubAst));
 
-  }
+    const subAst = subQb.getAST();
+
+    const finalSubAst = this.relationManager.applyRelationCorrelation(this.context, relationName, subAst, options?.correlate);
+
+    return this.where(exists(finalSubAst));
+
+  }
 
 
 
@@ -948,45 +1027,46 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  whereHasNot(
-
-    relationName: string,
-
-    callback?: <TChildTable extends TableDef>(
-
-      qb: SelectQueryBuilder<any, TChildTable>
-
-    ) => SelectQueryBuilder<any, TChildTable>
-
-  ): SelectQueryBuilder<T, TTable> {
-
-    const relation = this.env.table.relations[relationName];
-
-    if (!relation) {
-
+  whereHasNot(
+
+    relationName: string,
+
+    callbackOrOptions?: RelationCallback | WhereHasOptions,
+
+    maybeOptions?: WhereHasOptions
+
+  ): SelectQueryBuilder<T, TTable> {
+
+    const relation = this.env.table.relations[relationName];
+
+    if (!relation) {
+
       throw new Error(`Relation '${relationName}' not found on table '${this.env.table.name}'`);
 
     }
 
 
 
-    let subQb = this.createChildBuilder<any, typeof relation.target>(relation.target);
-
-    if (callback) {
-
-      subQb = callback(subQb);
-
-    }
-
-
-
-    const subAst = subQb.getAST();
-
-    const finalSubAst = this.relationManager.applyRelationCorrelation(this.context, relationName, subAst);
-
-    return this.where(notExists(finalSubAst));
-
-  }
+    const callback = typeof callbackOrOptions === 'function' ? callbackOrOptions as RelationCallback : undefined;
+    const options = (typeof callbackOrOptions === 'function' ? maybeOptions : callbackOrOptions) as WhereHasOptions | undefined;
+
+    let subQb = this.createChildBuilder<any, typeof relation.target>(relation.target);
+
+    if (callback) {
+
+      subQb = callback(subQb);
+
+    }
+
+
+
+    const subAst = subQb.getAST();
+
+    const finalSubAst = this.relationManager.applyRelationCorrelation(this.context, relationName, subAst, options?.correlate);
+
+    return this.where(notExists(finalSubAst));
+
+  }
 
 
 

package/src/schema/column.ts

@@ -1,39 +1,47 @@
 /**
  * Supported column data types for database schema definitions
  */
-export 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';
+export 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';
 
 export type ReferentialAction =
   | 'NO ACTION'
@@ -138,12 +146,40 @@ export const col = {
   /**
    * Creates a UUID column definition
    */
-  uuid: (): ColumnDef<'UUID'> => ({ name: '', type: 'UUID' }),
-
-  /**
-   * Creates a timestamp column definition
-   */
-  timestamp: (): ColumnDef<'TIMESTAMP'> => ({ name: '', type: 'TIMESTAMP' }),
+  uuid: (): ColumnDef<'UUID'> => ({ name: '', type: 'UUID' }),
+
+  /**
+   * Creates a binary large object column definition
+   */
+  blob: (): ColumnDef<'BLOB'> => ({ name: '', type: 'BLOB' }),
+
+  /**
+   * Creates a fixed-length binary column definition
+   */
+  binary: (length?: number): ColumnDef<'BINARY'> => ({
+    name: '',
+    type: 'BINARY',
+    args: length !== undefined ? [length] : undefined
+  }),
+
+  /**
+   * Creates a variable-length binary column definition
+   */
+  varbinary: (length?: number): ColumnDef<'VARBINARY'> => ({
+    name: '',
+    type: 'VARBINARY',
+    args: length !== undefined ? [length] : undefined
+  }),
+
+  /**
+   * Creates a Postgres bytea column definition
+   */
+  bytea: (): ColumnDef<'BYTEA'> => ({ name: '', type: 'BYTEA' }),
+
+  /**
+   * Creates a timestamp column definition
+   */
+  timestamp: (): ColumnDef<'TIMESTAMP'> => ({ name: '', type: 'TIMESTAMP' }),
 
   /**
    * Creates a timestamptz column definition

package/src/schema/types.ts

@@ -27,6 +27,7 @@ export type ColumnToTs<T extends ColumnDef> =
   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;