metal-orm 1.0.41 → 1.0.43

package/src/orm/save-graph.ts

@@ -1,4 +1,10 @@
-import type { EntityInstance } from '../schema/types.js';
+import type {
+  EntityInstance,
+  HasManyCollection,
+  HasOneReference,
+  BelongsToReference,
+  ManyToManyCollection
+} from '../schema/types.js';
 import {
   RelationKinds,
   type BelongsToManyRelation,
@@ -19,12 +25,12 @@ export interface SaveGraphOptions {
   pruneMissing?: boolean;
 }
 
-type AnyEntity = Record<string, any>;
+type AnyEntity = Record<string, unknown>;
 
 const toKey = (value: unknown): string => (value === null || value === undefined ? '' : String(value));
 
-const pickColumns = (table: TableDef, payload: AnyEntity): Record<string, any> => {
-  const columns: Record<string, any> = {};
+const pickColumns = (table: TableDef, payload: AnyEntity): Record<string, unknown> => {
+  const columns: Record<string, unknown> = {};
   for (const key of Object.keys(table.columns)) {
     if (payload[key] !== undefined) {
       columns[key] = payload[key];
@@ -71,7 +77,7 @@ const isEntityInCollection = (items: AnyEntity[], pkName: string, entity: AnyEnt
   return items.some(item => toKey(item[pkName]) === toKey(entityPk));
 };
 
-const findInCollectionByPk = (items: AnyEntity[], pkName: string, pkValue: any): AnyEntity | undefined => {
+const findInCollectionByPk = (items: AnyEntity[], pkName: string, pkValue: unknown): AnyEntity | undefined => {
   if (pkValue === undefined || pkValue === null) return undefined;
   return items.find(item => toKey(item[pkName]) === toKey(pkValue));
 };
@@ -85,12 +91,12 @@ const handleHasMany = async (
   options: SaveGraphOptions
 ): Promise<void> => {
   if (!Array.isArray(payload)) return;
-  const collection = root[relationName];
+  const collection = root[relationName] as unknown as HasManyCollection<unknown>;
   await collection.load();
 
   const targetTable = relation.target;
   const targetPk = findPrimaryKey(targetTable);
-  const existing = collection.getItems();
+  const existing = collection.getItems() as unknown as AnyEntity[];
   const seen = new Set<string>();
 
   for (const item of payload) {
@@ -103,10 +109,10 @@ const handleHasMany = async (
       (pkValue !== undefined && pkValue !== null ? session.getEntity(targetTable, pkValue) : undefined);
 
     const entity = current ?? ensureEntity(session, targetTable, asObj);
-    assignColumns(targetTable, entity, asObj);
-    await applyGraphToEntity(session, targetTable, entity, asObj, options);
+    assignColumns(targetTable, entity as AnyEntity, asObj);
+    await applyGraphToEntity(session, targetTable, entity as AnyEntity, asObj, options);
 
-    if (!isEntityInCollection(collection.getItems(), targetPk, entity)) {
+    if (!isEntityInCollection(collection.getItems() as unknown as AnyEntity[], targetPk, entity as unknown as AnyEntity)) {
       collection.attach(entity);
     }
 
@@ -133,7 +139,7 @@ const handleHasOne = async (
   payload: unknown,
   options: SaveGraphOptions
 ): Promise<void> => {
-  const ref = root[relationName];
+  const ref = root[relationName] as unknown as HasOneReference<unknown>;
   if (payload === undefined) return;
   if (payload === null) {
     ref.set(null);
@@ -143,13 +149,13 @@ const handleHasOne = async (
   if (typeof payload === 'number' || typeof payload === 'string') {
     const entity = ref.set({ [pk]: payload });
     if (entity) {
-      await applyGraphToEntity(session, relation.target, entity, { [pk]: payload }, options);
+      await applyGraphToEntity(session, relation.target, entity as AnyEntity, { [pk]: payload }, options);
     }
     return;
   }
   const attached = ref.set(payload as AnyEntity);
   if (attached) {
-    await applyGraphToEntity(session, relation.target, attached, payload as AnyEntity, options);
+    await applyGraphToEntity(session, relation.target, attached as AnyEntity, payload as AnyEntity, options);
   }
 };
 
@@ -161,7 +167,7 @@ const handleBelongsTo = async (
   payload: unknown,
   options: SaveGraphOptions
 ): Promise<void> => {
-  const ref = root[relationName];
+  const ref = root[relationName] as unknown as BelongsToReference<unknown>;
   if (payload === undefined) return;
   if (payload === null) {
     ref.set(null);
@@ -171,13 +177,13 @@ const handleBelongsTo = async (
   if (typeof payload === 'number' || typeof payload === 'string') {
     const entity = ref.set({ [pk]: payload });
     if (entity) {
-      await applyGraphToEntity(session, relation.target, entity, { [pk]: payload }, options);
+      await applyGraphToEntity(session, relation.target, entity as AnyEntity, { [pk]: payload }, options);
     }
     return;
   }
   const attached = ref.set(payload as AnyEntity);
   if (attached) {
-    await applyGraphToEntity(session, relation.target, attached, payload as AnyEntity, options);
+    await applyGraphToEntity(session, relation.target, attached as AnyEntity, payload as AnyEntity, options);
   }
 };
 
@@ -190,7 +196,7 @@ const handleBelongsToMany = async (
   options: SaveGraphOptions
 ): Promise<void> => {
   if (!Array.isArray(payload)) return;
-  const collection = root[relationName];
+  const collection = root[relationName] as unknown as ManyToManyCollection<unknown>;
   await collection.load();
 
   const targetTable = relation.target;
@@ -212,10 +218,10 @@ const handleBelongsToMany = async (
       ? session.getEntity(targetTable, pkValue) ?? ensureEntity(session, targetTable, asObj)
       : ensureEntity(session, targetTable, asObj);
 
-    assignColumns(targetTable, entity, asObj);
-    await applyGraphToEntity(session, targetTable, entity, asObj, options);
+    assignColumns(targetTable, entity as AnyEntity, asObj);
+    await applyGraphToEntity(session, targetTable, entity as AnyEntity, asObj, options);
 
-    if (!isEntityInCollection(collection.getItems(), targetPk, entity)) {
+    if (!isEntityInCollection(collection.getItems() as unknown as AnyEntity[], targetPk, entity as unknown as AnyEntity)) {
       collection.attach(entity);
     }
 
@@ -225,7 +231,7 @@ const handleBelongsToMany = async (
   }
 
   if (options.pruneMissing) {
-    for (const item of [...collection.getItems()]) {
+    for (const item of [...collection.getItems()] as unknown as AnyEntity[]) {
       const pkValue = item[targetPk];
       if (pkValue !== undefined && pkValue !== null && !seen.has(toKey(pkValue))) {
         collection.detach(item);
@@ -272,7 +278,7 @@ const applyGraphToEntity = async (
 
 export const saveGraph = async <TTable extends TableDef>(
   session: OrmSession,
-  entityClass: EntityConstructor<any>,
+  entityClass: EntityConstructor,
   payload: AnyEntity,
   options: SaveGraphOptions = {}
 ): Promise<EntityInstance<TTable>> => {
@@ -282,11 +288,11 @@ export const saveGraph = async <TTable extends TableDef>(
   }
 
   const root = ensureEntity<TTable>(session, table as TTable, payload);
-  await applyGraphToEntity(session, table, root, payload, options);
+  await applyGraphToEntity(session, table, root as AnyEntity, payload, options);
   return root;
 };
 
-export const saveGraphInternal = async <TCtor extends EntityConstructor<any>>(
+export const saveGraphInternal = async <TCtor extends EntityConstructor>(
   session: OrmSession,
   entityClass: TCtor,
   payload: AnyEntity,
@@ -298,6 +304,6 @@ export const saveGraphInternal = async <TCtor extends EntityConstructor<any>>(
   }
 
   const root = ensureEntity(session, table, payload);
-  await applyGraphToEntity(session, table, root, payload, options);
+  await applyGraphToEntity(session, table, root as AnyEntity, payload, options);
   return root as unknown as InstanceType<TCtor>;
 };

package/src/orm/unit-of-work.ts

@@ -14,7 +14,7 @@ import type { TrackedEntity } from './runtime-types.js';
  * Unit of Work pattern implementation for tracking entity changes.
  */
 export class UnitOfWork {
-  private readonly trackedEntities = new Map<any, TrackedEntity>();
+  private readonly trackedEntities = new Map<unknown, TrackedEntity>();
 
   /**
    * Creates a new UnitOfWork instance.
@@ -51,7 +51,7 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @returns The entity or undefined if not found
    */
-  getEntity(table: TableDef, pk: string | number): any | undefined {
+  getEntity(table: TableDef, pk: string | number): unknown | undefined {
     return this.identityMap.getEntity(table, pk);
   }
 
@@ -69,7 +69,7 @@ export class UnitOfWork {
    * @param entity - The entity to find
    * @returns The tracked entity or undefined if not found
    */
-  findTracked(entity: any): TrackedEntity | undefined {
+  findTracked(entity: unknown): TrackedEntity | undefined {
     return this.trackedEntities.get(entity);
   }
 
@@ -79,7 +79,7 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @param entity - The entity instance
    */
-  setEntity(table: TableDef, pk: string | number, entity: any): void {
+  setEntity(table: TableDef, pk: string | number, entity: unknown): void {
     if (pk === null || pk === undefined) return;
     let tracked = this.trackedEntities.get(entity);
     if (!tracked) {
@@ -88,7 +88,7 @@ export class UnitOfWork {
         entity,
         pk,
         status: EntityStatus.Managed,
-        original: this.createSnapshot(table, entity)
+        original: this.createSnapshot(table, entity as Record<string, unknown>)
       };
       this.trackedEntities.set(entity, tracked);
     } else {
@@ -104,7 +104,7 @@ export class UnitOfWork {
    * @param entity - The entity instance
    * @param pk - Optional primary key value
    */
-  trackNew(table: TableDef, entity: any, pk?: string | number): void {
+  trackNew(table: TableDef, entity: unknown, pk?: string | number): void {
     const tracked: TrackedEntity = {
       table,
       entity,
@@ -124,13 +124,13 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @param entity - The entity instance
    */
-  trackManaged(table: TableDef, pk: string | number, entity: any): void {
+  trackManaged(table: TableDef, pk: string | number, entity: unknown): void {
     const tracked: TrackedEntity = {
       table,
       entity,
       pk,
       status: EntityStatus.Managed,
-      original: this.createSnapshot(table, entity)
+      original: this.createSnapshot(table, entity as Record<string, unknown>)
     };
     this.trackedEntities.set(entity, tracked);
     this.registerIdentity(tracked);
@@ -140,7 +140,7 @@ export class UnitOfWork {
    * Marks an entity as dirty (modified).
    * @param entity - The entity to mark as dirty
    */
-  markDirty(entity: any): void {
+  markDirty(entity: unknown): void {
     const tracked = this.trackedEntities.get(entity);
     if (!tracked) return;
     if (tracked.status === EntityStatus.New || tracked.status === EntityStatus.Removed) return;
@@ -151,7 +151,7 @@ export class UnitOfWork {
    * Marks an entity as removed.
    * @param entity - The entity to mark as removed
    */
-  markRemoved(entity: any): void {
+  markRemoved(entity: unknown): void {
     const tracked = this.trackedEntities.get(entity);
     if (!tracked) return;
     tracked.status = EntityStatus.Removed;
@@ -194,7 +194,7 @@ export class UnitOfWork {
   private async flushInsert(tracked: TrackedEntity): Promise<void> {
     await this.runHook(tracked.table.hooks?.beforeInsert, tracked);
 
-    const payload = this.extractColumns(tracked.table, tracked.entity);
+    const payload = this.extractColumns(tracked.table, tracked.entity as Record<string, unknown>);
     let builder = new InsertQueryBuilder(tracked.table).values(payload);
     if (this.dialect.supportsReturning()) {
       builder = builder.returning(...this.getReturningColumns(tracked.table));
@@ -204,7 +204,7 @@ export class UnitOfWork {
     this.applyReturningResults(tracked, results);
 
     tracked.status = EntityStatus.Managed;
-    tracked.original = this.createSnapshot(tracked.table, tracked.entity);
+    tracked.original = this.createSnapshot(tracked.table, tracked.entity as Record<string, unknown>);
     tracked.pk = this.getPrimaryKeyValue(tracked);
     this.registerIdentity(tracked);
 
@@ -241,7 +241,7 @@ export class UnitOfWork {
     this.applyReturningResults(tracked, results);
 
     tracked.status = EntityStatus.Managed;
-    tracked.original = this.createSnapshot(tracked.table, tracked.entity);
+    tracked.original = this.createSnapshot(tracked.table, tracked.entity as Record<string, unknown>);
     this.registerIdentity(tracked);
 
     await this.runHook(tracked.table.hooks?.afterUpdate, tracked);
@@ -279,7 +279,7 @@ export class UnitOfWork {
     tracked: TrackedEntity
   ): Promise<void> {
     if (!hook) return;
-    await hook(this.hookContext() as any, tracked.entity);
+    await hook(this.hookContext(), tracked.entity);
   }
 
   /**
@@ -305,7 +305,7 @@ export class UnitOfWork {
    * @param entity - The entity instance
    * @returns Object with column values
    */
-  private extractColumns(table: TableDef, entity: any): Record<string, unknown> {
+  private extractColumns(table: TableDef, entity: Record<string, unknown>): Record<string, unknown> {
     const payload: Record<string, unknown> = {};
     for (const column of Object.keys(table.columns)) {
       if (entity[column] === undefined) continue;
@@ -381,8 +381,8 @@ export class UnitOfWork {
    * @param entity - The entity instance
    * @returns Object with entity state
    */
-  private createSnapshot(table: TableDef, entity: any): Record<string, any> {
-    const snapshot: Record<string, any> = {};
+  private createSnapshot(table: TableDef, entity: Record<string, unknown>): Record<string, unknown> {
+    const snapshot: Record<string, unknown> = {};
     for (const column of Object.keys(table.columns)) {
       snapshot[column] = entity[column];
     }

package/src/query-builder/delete.ts

@@ -76,9 +76,10 @@ export class DeleteQueryBuilder<T> {
   compile(dialect: DeleteDialectInput): CompiledQuery;
 
   compile(arg: DeleteCompiler | DeleteDialectInput): CompiledQuery {
-    if (typeof (arg as any).compileDelete === 'function') {
+    const candidate = arg as { compileDelete?: (ast: DeleteQueryNode) => CompiledQuery };
+    if (typeof candidate.compileDelete === 'function') {
       // DeleteCompiler path – old behavior
-      return (arg as DeleteCompiler).compileDelete(this.state.ast);
+      return candidate.compileDelete(this.state.ast);
     }
 
     // Dialect | string path – new behavior
@@ -87,7 +88,7 @@ export class DeleteQueryBuilder<T> {
   }
 
   toSql(arg: DeleteCompiler | DeleteDialectInput): string {
-    return this.compile(arg as any).sql;
+    return this.compile(arg as DeleteCompiler).sql;
   }
 
   getAST(): DeleteQueryNode {

package/src/query-builder/hydration-manager.ts

@@ -20,7 +20,7 @@ export class HydrationManager {
   constructor(
     private readonly table: TableDef,
     private readonly planner: HydrationPlanner
-  ) {}
+  ) { }
 
   /**
    * Creates a new HydrationManager with updated planner
@@ -219,7 +219,8 @@ export class HydrationManager {
   private getProjectionNames(columns: ProjectionNode[]): string[] | undefined {
     const names: string[] = [];
     for (const col of columns) {
-      const alias = (col as any).alias ?? (col as any).name;
+      const node = col as { alias?: string; name?: string };
+      const alias = node.alias ?? node.name;
       if (!alias) return undefined;
       names.push(alias);
     }
@@ -267,7 +268,7 @@ export class HydrationManager {
     baseAlias: string,
     availableColumns: Set<string>
   ): OrderByNode['term'] | null {
-    if ((term as any).type === 'Column') {
+    if (term.type === 'Column') {
       const col = term as ColumnNode;
       if (col.table !== plan.rootTable) return null;
       const alias = projectionAliases.get(`${col.table}.${col.name}`) ?? col.name;
@@ -275,8 +276,8 @@ export class HydrationManager {
       return { type: 'Column', table: baseAlias, name: alias };
     }
 
-    if ((term as any).type === 'AliasRef') {
-      const aliasName = (term as any).name;
+    if (term.type === 'AliasRef') {
+      const aliasName = term.name;
       if (!availableColumns.has(aliasName)) return null;
       return { type: 'Column', table: baseAlias, name: aliasName };
     }

package/src/query-builder/insert.ts

@@ -37,8 +37,8 @@ export class InsertQueryBuilder<T> {
     return this.clone(this.state.withColumns(this.resolveColumnNodes(columns)));
   }
 
-  fromSelect(
-    query: SelectQueryNode | SelectQueryBuilder<any, TableDef<any>>,
+  fromSelect<TSource extends TableDef>(
+    query: SelectQueryNode | SelectQueryBuilder<unknown, TSource>,
     columns: (ColumnDef | ColumnNode)[] = []
   ): InsertQueryBuilder<T> {
     const ast = this.resolveSelectQuery(query);
@@ -57,9 +57,12 @@ export class InsertQueryBuilder<T> {
     return columns.map(column => buildColumnNode(this.table, column));
   }
 
-  private resolveSelectQuery(query: SelectQueryNode | SelectQueryBuilder<any>): SelectQueryNode {
-    return typeof (query as any).getAST === 'function'
-      ? (query as SelectQueryBuilder<any>).getAST()
+  private resolveSelectQuery<TSource extends TableDef>(
+    query: SelectQueryNode | SelectQueryBuilder<unknown, TSource>
+  ): SelectQueryNode {
+    const candidate = query as { getAST?: () => SelectQueryNode };
+    return typeof candidate.getAST === 'function' && candidate.getAST
+      ? candidate.getAST()
       : (query as SelectQueryNode);
   }
 
@@ -71,9 +74,10 @@ export class InsertQueryBuilder<T> {
   compile(dialect: InsertDialectInput): CompiledQuery;
 
   compile(arg: InsertCompiler | InsertDialectInput): CompiledQuery {
-    if (typeof (arg as any).compileInsert === 'function') {
+    const candidate = arg as { compileInsert?: (ast: InsertQueryNode) => CompiledQuery };
+    if (typeof candidate.compileInsert === 'function') {
       // InsertCompiler path – old behavior
-      return (arg as InsertCompiler).compileInsert(this.state.ast);
+      return candidate.compileInsert(this.state.ast);
     }
 
     // Dialect | string path – new behavior
@@ -82,7 +86,7 @@ export class InsertQueryBuilder<T> {
   }
 
   toSql(arg: InsertCompiler | InsertDialectInput): string {
-    return this.compile(arg as any).sql;
+    return this.compile(arg as InsertCompiler).sql;
   }
 
   getAST(): InsertQueryNode {

package/src/query-builder/query-ast-service.ts

@@ -49,7 +49,7 @@ export class QueryAstService {
    * @param table - Table definition
    * @param state - Current query state
    */
-  constructor(private readonly table: TableDef, private readonly state: SelectQueryState) {}
+  constructor(private readonly table: TableDef, private readonly state: SelectQueryState) { }
 
   /**
    * Selects columns for the query
@@ -254,7 +254,7 @@ export class QueryAstService {
   private normalizeOrderingTerm(term: ColumnDef | OrderingTerm): OrderingTerm {
     const from = this.state.ast.from;
     const tableRef = from.type === 'Table' && from.alias ? { ...this.table, alias: from.alias } : this.table;
-    const termType = (term as any)?.type;
+    const termType = (term as { type?: string }).type;
     if (termType === 'Column') {
       return term as ColumnNode;
     }

package/src/query-builder/raw-column-parser.ts

@@ -11,7 +11,8 @@ export const parseRawColumn = (
   ctes?: CommonTableExpressionNode[]
 ): ColumnNode => {
   if (col.includes('(')) {
-    const [fn, rest] = col.split('(');
+    const [_fn, rest] = col.split('(');
+    void _fn;
     const colName = rest.replace(')', '');
     const [table, name] = colName.includes('.') ? colName.split('.') : [tableName, colName];
     return { type: 'Column', table, name, alias: col };

package/src/query-builder/select-helpers.ts

@@ -22,12 +22,12 @@ export function sel<
   return selection;
 }
 
-type Ctor<T> = { new (...args: any[]): T };
+type Ctor<T> = { new(...args: unknown[]): T };
 
 /**
  * Build a typed selection map from an entity constructor.
  */
-export function esel<TEntity, K extends keyof TEntity & string>(
+export function esel<TEntity extends object, K extends keyof TEntity & string>(
   entity: Ctor<TEntity>,
   ...props: K[]
 ): Record<K, ColumnDef> {

package/src/query-builder/select.ts

@@ -95,8 +95,8 @@ type WhereHasOptions = {
 };
 
 type RelationCallback = <TChildTable extends TableDef>(
-  qb: SelectQueryBuilder<any, TChildTable>
-) => SelectQueryBuilder<any, TChildTable>;
+  qb: SelectQueryBuilder<unknown, TChildTable>
+) => SelectQueryBuilder<unknown, TChildTable>;
 
 
 /**
@@ -109,7 +109,7 @@ type RelationCallback = <TChildTable extends TableDef>(
 
  */
 
-export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
+export class SelectQueryBuilder<T = unknown, TTable extends TableDef = TableDef> {
 
   private readonly env: SelectQueryBuilderEnvironment;
 
@@ -205,12 +205,11 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
 
 
-  private resolveQueryNode(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryNode {
-
-    return typeof (query as any).getAST === 'function'
-
-      ? (query as SelectQueryBuilder<any, TableDef<any>>).getAST()
+  private resolveQueryNode<TSub extends TableDef>(query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode): SelectQueryNode {
 
+    const candidate = query as { getAST?: () => SelectQueryNode };
+    return typeof candidate.getAST === 'function' && candidate.getAST
+      ? candidate.getAST()
       : (query as SelectQueryNode);
 
   }
@@ -272,11 +271,11 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
 
 
-  private applySetOperation(
+  private applySetOperation<TSub extends TableDef>(
 
     operator: SetOperationKind,
 
-    query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode
+    query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode
 
   ): SelectQueryBuilderContext {
 
@@ -357,7 +356,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  with(name: string, query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable> {
+  with<TSub extends TableDef>(name: string, query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable> {
 
     const subAst = this.resolveQueryNode(query);
 
@@ -383,7 +382,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  withRecursive(name: string, query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable> {
+  withRecursive<TSub extends TableDef>(name: string, query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode, columns?: string[]): SelectQueryBuilder<T, TTable> {
 
     const subAst = this.resolveQueryNode(query);
 
@@ -401,8 +400,8 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
    * @param columnAliases - Optional column alias list
    * @returns New query builder instance with updated FROM
    */
-  fromSubquery(
-    subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode,
+  fromSubquery<TSub extends TableDef>(
+    subquery: SelectQueryBuilder<unknown, TSub> | SelectQueryNode,
     alias: string,
     columnAliases?: string[]
   ): SelectQueryBuilder<T, TTable> {
@@ -426,7 +425,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  selectSubquery(alias: string, sub: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+  selectSubquery<TSub extends TableDef>(alias: string, sub: SelectQueryBuilder<unknown, TSub> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
 
     const query = this.resolveQueryNode(sub);
 
@@ -444,8 +443,8 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
    * @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,
+  joinSubquery<TSub extends TableDef>(
+    subquery: SelectQueryBuilder<unknown, TSub> | SelectQueryNode,
     alias: string,
     condition: BinaryExpressionNode,
     joinKind: JoinKind = JOIN_KINDS.INNER,
@@ -655,10 +654,11 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
    * Selects columns for the root table and relations from a single config object.
    */
   selectColumnsDeep(config: DeepSelectConfig<TTable>): SelectQueryBuilder<T, TTable> {
-    let qb: SelectQueryBuilder<T, TTable> = this;
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    let currBuilder: SelectQueryBuilder<T, TTable> = this;
 
     if (config.root?.length) {
-      qb = qb.selectColumns(...config.root);
+      currBuilder = currBuilder.selectColumns(...config.root);
     }
 
     for (const key of Object.keys(config) as (keyof typeof config)[]) {
@@ -666,10 +666,10 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
       const relName = key as keyof TTable['relations'] & string;
       const cols = config[relName as keyof DeepSelectConfig<TTable>] as string[] | undefined;
       if (!cols || !cols.length) continue;
-      qb = qb.selectRelationColumns(relName, ...(cols as string[]));
+      currBuilder = currBuilder.selectRelationColumns(relName, ...(cols as string[]));
     }
 
-    return qb;
+    return currBuilder;
   }
 
 
@@ -848,7 +848,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  union(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+  union<TSub extends TableDef>(query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
 
     return this.clone(this.applySetOperation('UNION', query));
 
@@ -866,7 +866,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  unionAll(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+  unionAll<TSub extends TableDef>(query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
 
     return this.clone(this.applySetOperation('UNION ALL', query));
 
@@ -884,7 +884,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  intersect(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+  intersect<TSub extends TableDef>(query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
 
     return this.clone(this.applySetOperation('INTERSECT', query));
 
@@ -902,7 +902,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  except(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+  except<TSub extends TableDef>(query: SelectQueryBuilder<unknown, TSub> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
 
     return this.clone(this.applySetOperation('EXCEPT', query));
 
@@ -920,8 +920,8 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  whereExists(
-    subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode,
+  whereExists<TSub extends TableDef>(
+    subquery: SelectQueryBuilder<unknown, TSub> | SelectQueryNode,
     correlate?: ExpressionNode
   ): SelectQueryBuilder<T, TTable> {
     const subAst = this.resolveQueryNode(subquery);
@@ -941,8 +941,8 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
 
    */
 
-  whereNotExists(
-    subquery: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode,
+  whereNotExists<TSub extends TableDef>(
+    subquery: SelectQueryBuilder<unknown, TSub> | SelectQueryNode,
     correlate?: ExpressionNode
   ): SelectQueryBuilder<T, TTable> {
     const subAst = this.resolveQueryNode(subquery);
@@ -987,7 +987,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
     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);
+    let subQb = this.createChildBuilder<unknown, typeof relation.target>(relation.target);
 
     if (callback) {
 
@@ -1042,7 +1042,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
     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);
+    let subQb = this.createChildBuilder<unknown, typeof relation.target>(relation.target);
 
     if (callback) {