drizzle-orm 0.38.3-e6823b4 → 0.38.3-efed06b

package/relations.d.cts

@@ -2,7 +2,7 @@ import { type AnyTable, type InferModelFromColumns, Table } from "./table.cjs";
 import { type AnyColumn, Column } from "./column.cjs";
 import { entityKind } from "./entity.cjs";
 import { and, asc, between, desc, exists, ilike, inArray, isNotNull, isNull, like, not, notBetween, notExists, notIlike, notInArray, notLike, or } from "./sql/expressions/index.cjs";
-import { Placeholder, SQL, sql, type SQLWrapper } from "./sql/sql.cjs";
+import { type Placeholder, SQL, sql, type SQLWrapper } from "./sql/sql.cjs";
 import { type Assume, type Equal, type Simplify, type ValueOrArray, type Writable } from "./utils.cjs";
 export declare class Relations<TSchema extends Record<string, unknown> = Record<string, unknown>, TTables extends Record<string, Table> = Record<string, Table>, TConfig extends RelationsBuilderConfig<TTables> = RelationsBuilderConfig<TTables>> {
     readonly schema: TSchema;
@@ -35,6 +35,12 @@ export declare abstract class Relation<TSourceTableName extends string = string,
     sourceTable: AnyTable<{
         name: TSourceTableName;
     }>;
+    through?: {
+        source: AnyColumn[];
+        target: AnyColumn[];
+    };
+    throughTable?: Table;
+    isReversed?: boolean;
     constructor(targetTable: AnyTable<{
         name: TTargetTableName;
     }>);
@@ -122,7 +128,7 @@ export type DBQueryConfig<TRelationType extends 'one' | 'many' = 'one' | 'many',
         [K in keyof TTableConfig['columns']]?: boolean | undefined;
     } | undefined;
     with?: {
-        [K in keyof TTableConfig['relations']]?: true | (TTableConfig['relations'][K] extends Relation ? DBQueryConfig<TTableConfig['relations'][K] extends One<string, string> ? 'one' : 'many', TSchema, FindTableInRelationalConfig<TSchema, TTableConfig['relations'][K]['targetTable']>> : never) | undefined;
+        [K in keyof TTableConfig['relations']]?: boolean | (TTableConfig['relations'][K] extends Relation ? DBQueryConfig<TTableConfig['relations'][K] extends One<string, string> ? 'one' : 'many', TSchema, FindTableInRelationalConfig<TSchema, TTableConfig['relations'][K]['targetTable']>> : never) | undefined;
     } | undefined;
     extras?: Record<string, SQLWrapper> | ((table: Simplify<AnyTable<TTableConfig> & TTableConfig['columns']>, operators: SQLOperator) => Record<string, SQLWrapper>) | undefined;
     offset?: number | Placeholder | undefined;
@@ -164,11 +170,14 @@ export type ExtractTablesWithRelations<TRelations extends Relations, TTables ext
 };
 export type ReturnTypeOrValue<T> = T extends (...args: any[]) => infer R ? R : T;
 export type BuildRelationResult<TConfig extends TablesRelationalConfig, TInclude, TRelations extends Record<string, RelationsBuilderEntry>> = {
-    [K in NonUndefinedKeysOnly<TInclude> & keyof TRelations]: TRelations[K] extends infer TRel extends Relation ? BuildQueryResult<TConfig, FindTableInRelationalConfig<TConfig, TRel['targetTable']>, Assume<TInclude[K], true | Record<string, unknown>>> extends infer TResult ? TRel extends One<string, string> ? TResult | (Equal<TRel['optional'], true> extends true ? null : never) : TResult[] : never : TRelations[K] extends AggregatedField<infer TData> ? TData : never;
+    [K in TruthyKeysOnly<TInclude> & keyof TRelations]: TRelations[K] extends infer TRel extends Relation ? BuildQueryResult<TConfig, FindTableInRelationalConfig<TConfig, TRel['targetTable']>, Assume<TInclude[K], true | Record<string, unknown>>> extends infer TResult ? TRel extends One<string, string> ? TResult | (Equal<TRel['optional'], true> extends true ? null : TInclude[K] extends Record<string, unknown> ? TInclude[K]['where'] extends Record<string, any> ? null : never : never) : TResult[] : never : TRelations[K] extends AggregatedField<infer TData> ? TData : never;
 };
 export type NonUndefinedKeysOnly<T> = ExtractObjectValues<{
     [K in keyof T as T[K] extends undefined ? never : K]: K;
 }> & keyof T;
+export type TruthyKeysOnly<T> = ExtractObjectValues<{
+    [K in keyof T as T[K] extends undefined | false ? never : K]: K;
+}> & keyof T;
 export type BuildQueryResult<TSchema extends TablesRelationalConfig, TTableConfig extends TableRelationalConfig, TFullSelection extends true | Record<string, unknown>> = Equal<TFullSelection, true> extends true ? InferModelFromColumns<TTableConfig['columns']> : TFullSelection extends Record<string, unknown> ? Simplify<(TFullSelection['columns'] extends Record<string, unknown> ? InferModelFromColumns<{
     [K in Equal<Exclude<TFullSelection['columns'][keyof TFullSelection['columns'] & keyof TTableConfig['columns']], undefined>, false> extends true ? Exclude<keyof TTableConfig['columns'], NonUndefinedKeysOnly<TFullSelection['columns']>> : {
         [K in keyof TFullSelection['columns']]: Equal<TFullSelection['columns'][K], true> extends true ? K : never;
@@ -186,12 +195,13 @@ export interface BuildRelationalQueryResult {
         field: Column | Table | SQL | SQL.Aliased | SQLWrapper | AggregatedField;
         isArray?: boolean;
         selection?: BuildRelationalQueryResult['selection'];
+        isOptional?: boolean;
     }[];
     sql: SQL;
 }
 export declare function mapRelationalRow(row: Record<string, unknown>, buildQueryResultSelection: BuildRelationalQueryResult['selection'], mapColumnValue?: (value: unknown) => unknown, 
 /** Needed for SQLite as it returns JSON values as strings */
-parseJson?: boolean): Record<string, unknown>;
+parseJson?: boolean, path?: string): Record<string, unknown>;
 export declare class RelationsBuilderTable<TTableName extends string = string> implements SQLWrapper {
     static readonly [entityKind]: string;
     readonly _: {
@@ -211,7 +221,7 @@ export type RelationsBuilderColumnConfig<TTableName extends string = string, TDa
     readonly column: AnyColumn<{
         tableName: TTableName;
     }>;
-    through?: RelationsBuilderColumnBase;
+    readonly through?: RelationsBuilderColumnBase;
 };
 export type RelationsBuilderColumnBase<TTableName extends string = string, TData = unknown> = {
     _: RelationsBuilderColumnConfig<TTableName, TData>;
@@ -224,33 +234,33 @@ export declare class RelationsBuilderColumn<TTableName extends string = string,
         readonly column: AnyColumn<{
             tableName: TTableName;
         }>;
-        through?: RelationsBuilderColumnBase;
+        readonly through?: RelationsBuilderColumnBase;
     };
     constructor(column: AnyColumn<{
         tableName: TTableName;
-    }>);
-    through(column: RelationsBuilderColumnBase<string, TData>): Omit<this, 'through'>;
+    }>, through?: RelationsBuilderColumn);
+    through(column: RelationsBuilderColumn): RelationsBuilderColumnBase<TTableName, TData>;
     getSQL(): SQL;
 }
 export type RelationFieldsFilterInternals<T> = {
-    eq?: T;
-    ne?: T;
-    gt?: T;
-    gte?: T;
-    lt?: T;
-    lte?: T;
-    in?: T[];
-    notIn?: T[];
-    like?: string;
-    ilike?: string;
-    notLike?: string;
-    notIlike?: string;
+    eq?: T | Placeholder;
+    ne?: T | Placeholder;
+    gt?: T | Placeholder;
+    gte?: T | Placeholder;
+    lt?: T | Placeholder;
+    lte?: T | Placeholder;
+    in?: (T | Placeholder)[] | Placeholder;
+    notIn?: (T | Placeholder)[] | Placeholder;
+    like?: string | Placeholder;
+    ilike?: string | Placeholder;
+    notLike?: string | Placeholder;
+    notIlike?: string | Placeholder;
     isNull?: true;
     isNotNull?: true;
     NOT?: RelationsFieldFilter<T>;
     OR?: RelationsFieldFilter<T>[];
 };
-export type RelationsFieldFilter<T> = T | RelationFieldsFilterInternals<T | Placeholder>;
+export type RelationsFieldFilter<T> = RelationFieldsFilterInternals<T> | (T extends Record<string, any> ? never : T);
 export type RelationsFilter<TColumns extends Record<string, Column>> = {
     [K in keyof TColumns]?: RelationsFieldFilter<TColumns[K]['_']['data']>;
 } & {
@@ -258,9 +268,7 @@ export type RelationsFilter<TColumns extends Record<string, Column>> = {
     NOT?: RelationsFilter<TColumns>;
     RAW?: (table: Simplify<AnyTable<{
         columns: TColumns;
-    }> & {
-        [K in keyof TColumns]: TColumns[K];
-    }>, operators: Operators) => SQL;
+    }> & TColumns>, operators: Operators) => SQL;
 };
 export interface OneConfig<TSchema extends Record<string, Table>, TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | Readonly<RelationsBuilderColumnBase>, TTargetTableName extends string, TOptional extends boolean> {
     from?: TSourceColumns | Writable<TSourceColumns>;
@@ -282,7 +290,7 @@ export interface ManyConfig<TSchema extends Record<string, Table>, TSourceColumn
 }
 export type AnyManyConfig = ManyConfig<Record<string, Table>, Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | Readonly<RelationsBuilderColumnBase>, string>;
 export interface OneFn<TTables extends Record<string, Table>, TTargetTableName extends string> {
-    <TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | RelationsBuilderColumnBase = any, TOptional extends boolean = false>(config?: OneConfig<TTables, TSourceColumns, TTargetTableName, TOptional>): One<TSourceColumns extends [RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]] ? TSourceColumns[number]['_']['tableName'] : Assume<TSourceColumns, RelationsBuilderColumnBase>['_']['tableName'], TTargetTableName, TOptional>;
+    <TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | RelationsBuilderColumnBase = any, TOptional extends boolean = true>(config?: OneConfig<TTables, TSourceColumns, TTargetTableName, TOptional>): One<TSourceColumns extends [RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]] ? TSourceColumns[number]['_']['tableName'] : Assume<TSourceColumns, RelationsBuilderColumnBase>['_']['tableName'], TTargetTableName, TOptional>;
 }
 export interface ManyFn<TTables extends Record<string, Table>, TTargetTableName extends string> {
     <TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | RelationsBuilderColumnBase = any>(config?: ManyConfig<TTables, TSourceColumns, TTargetTableName>): Many<TSourceColumns extends [RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]] ? TSourceColumns[number]['_']['tableName'] : Assume<TSourceColumns, RelationsBuilderColumnBase>['_']['tableName'], TTargetTableName>;
@@ -341,7 +349,12 @@ export declare function relationExtrasToSQL(table: Table, extras: Extras): {
         field: Column | Table | SQL | SQL.Aliased | SQLWrapper | AggregatedField;
         isArray?: boolean;
         selection?: BuildRelationalQueryResult["selection"];
+        isOptional?: boolean;
     }[];
 };
-export declare function relationToSQL(relation: Relation, sourceTable: Table, targetTable: Table): SQL | undefined;
+export type BuiltRelationFilters = {
+    filter?: SQL;
+    joinCondition?: SQL;
+};
+export declare function relationToSQL(relation: Relation, sourceTable: Table, targetTable: Table, throughTable?: Table): BuiltRelationFilters;
 export {};

package/relations.d.ts

@@ -2,7 +2,7 @@ import { type AnyTable, type InferModelFromColumns, Table } from "./table.js";
 import { type AnyColumn, Column } from "./column.js";
 import { entityKind } from "./entity.js";
 import { and, asc, between, desc, exists, ilike, inArray, isNotNull, isNull, like, not, notBetween, notExists, notIlike, notInArray, notLike, or } from "./sql/expressions/index.js";
-import { Placeholder, SQL, sql, type SQLWrapper } from "./sql/sql.js";
+import { type Placeholder, SQL, sql, type SQLWrapper } from "./sql/sql.js";
 import { type Assume, type Equal, type Simplify, type ValueOrArray, type Writable } from "./utils.js";
 export declare class Relations<TSchema extends Record<string, unknown> = Record<string, unknown>, TTables extends Record<string, Table> = Record<string, Table>, TConfig extends RelationsBuilderConfig<TTables> = RelationsBuilderConfig<TTables>> {
     readonly schema: TSchema;
@@ -35,6 +35,12 @@ export declare abstract class Relation<TSourceTableName extends string = string,
     sourceTable: AnyTable<{
         name: TSourceTableName;
     }>;
+    through?: {
+        source: AnyColumn[];
+        target: AnyColumn[];
+    };
+    throughTable?: Table;
+    isReversed?: boolean;
     constructor(targetTable: AnyTable<{
         name: TTargetTableName;
     }>);
@@ -122,7 +128,7 @@ export type DBQueryConfig<TRelationType extends 'one' | 'many' = 'one' | 'many',
         [K in keyof TTableConfig['columns']]?: boolean | undefined;
     } | undefined;
     with?: {
-        [K in keyof TTableConfig['relations']]?: true | (TTableConfig['relations'][K] extends Relation ? DBQueryConfig<TTableConfig['relations'][K] extends One<string, string> ? 'one' : 'many', TSchema, FindTableInRelationalConfig<TSchema, TTableConfig['relations'][K]['targetTable']>> : never) | undefined;
+        [K in keyof TTableConfig['relations']]?: boolean | (TTableConfig['relations'][K] extends Relation ? DBQueryConfig<TTableConfig['relations'][K] extends One<string, string> ? 'one' : 'many', TSchema, FindTableInRelationalConfig<TSchema, TTableConfig['relations'][K]['targetTable']>> : never) | undefined;
     } | undefined;
     extras?: Record<string, SQLWrapper> | ((table: Simplify<AnyTable<TTableConfig> & TTableConfig['columns']>, operators: SQLOperator) => Record<string, SQLWrapper>) | undefined;
     offset?: number | Placeholder | undefined;
@@ -164,11 +170,14 @@ export type ExtractTablesWithRelations<TRelations extends Relations, TTables ext
 };
 export type ReturnTypeOrValue<T> = T extends (...args: any[]) => infer R ? R : T;
 export type BuildRelationResult<TConfig extends TablesRelationalConfig, TInclude, TRelations extends Record<string, RelationsBuilderEntry>> = {
-    [K in NonUndefinedKeysOnly<TInclude> & keyof TRelations]: TRelations[K] extends infer TRel extends Relation ? BuildQueryResult<TConfig, FindTableInRelationalConfig<TConfig, TRel['targetTable']>, Assume<TInclude[K], true | Record<string, unknown>>> extends infer TResult ? TRel extends One<string, string> ? TResult | (Equal<TRel['optional'], true> extends true ? null : never) : TResult[] : never : TRelations[K] extends AggregatedField<infer TData> ? TData : never;
+    [K in TruthyKeysOnly<TInclude> & keyof TRelations]: TRelations[K] extends infer TRel extends Relation ? BuildQueryResult<TConfig, FindTableInRelationalConfig<TConfig, TRel['targetTable']>, Assume<TInclude[K], true | Record<string, unknown>>> extends infer TResult ? TRel extends One<string, string> ? TResult | (Equal<TRel['optional'], true> extends true ? null : TInclude[K] extends Record<string, unknown> ? TInclude[K]['where'] extends Record<string, any> ? null : never : never) : TResult[] : never : TRelations[K] extends AggregatedField<infer TData> ? TData : never;
 };
 export type NonUndefinedKeysOnly<T> = ExtractObjectValues<{
     [K in keyof T as T[K] extends undefined ? never : K]: K;
 }> & keyof T;
+export type TruthyKeysOnly<T> = ExtractObjectValues<{
+    [K in keyof T as T[K] extends undefined | false ? never : K]: K;
+}> & keyof T;
 export type BuildQueryResult<TSchema extends TablesRelationalConfig, TTableConfig extends TableRelationalConfig, TFullSelection extends true | Record<string, unknown>> = Equal<TFullSelection, true> extends true ? InferModelFromColumns<TTableConfig['columns']> : TFullSelection extends Record<string, unknown> ? Simplify<(TFullSelection['columns'] extends Record<string, unknown> ? InferModelFromColumns<{
     [K in Equal<Exclude<TFullSelection['columns'][keyof TFullSelection['columns'] & keyof TTableConfig['columns']], undefined>, false> extends true ? Exclude<keyof TTableConfig['columns'], NonUndefinedKeysOnly<TFullSelection['columns']>> : {
         [K in keyof TFullSelection['columns']]: Equal<TFullSelection['columns'][K], true> extends true ? K : never;
@@ -186,12 +195,13 @@ export interface BuildRelationalQueryResult {
         field: Column | Table | SQL | SQL.Aliased | SQLWrapper | AggregatedField;
         isArray?: boolean;
         selection?: BuildRelationalQueryResult['selection'];
+        isOptional?: boolean;
     }[];
     sql: SQL;
 }
 export declare function mapRelationalRow(row: Record<string, unknown>, buildQueryResultSelection: BuildRelationalQueryResult['selection'], mapColumnValue?: (value: unknown) => unknown, 
 /** Needed for SQLite as it returns JSON values as strings */
-parseJson?: boolean): Record<string, unknown>;
+parseJson?: boolean, path?: string): Record<string, unknown>;
 export declare class RelationsBuilderTable<TTableName extends string = string> implements SQLWrapper {
     static readonly [entityKind]: string;
     readonly _: {
@@ -211,7 +221,7 @@ export type RelationsBuilderColumnConfig<TTableName extends string = string, TDa
     readonly column: AnyColumn<{
         tableName: TTableName;
     }>;
-    through?: RelationsBuilderColumnBase;
+    readonly through?: RelationsBuilderColumnBase;
 };
 export type RelationsBuilderColumnBase<TTableName extends string = string, TData = unknown> = {
     _: RelationsBuilderColumnConfig<TTableName, TData>;
@@ -224,33 +234,33 @@ export declare class RelationsBuilderColumn<TTableName extends string = string,
         readonly column: AnyColumn<{
             tableName: TTableName;
         }>;
-        through?: RelationsBuilderColumnBase;
+        readonly through?: RelationsBuilderColumnBase;
     };
     constructor(column: AnyColumn<{
         tableName: TTableName;
-    }>);
-    through(column: RelationsBuilderColumnBase<string, TData>): Omit<this, 'through'>;
+    }>, through?: RelationsBuilderColumn);
+    through(column: RelationsBuilderColumn): RelationsBuilderColumnBase<TTableName, TData>;
     getSQL(): SQL;
 }
 export type RelationFieldsFilterInternals<T> = {
-    eq?: T;
-    ne?: T;
-    gt?: T;
-    gte?: T;
-    lt?: T;
-    lte?: T;
-    in?: T[];
-    notIn?: T[];
-    like?: string;
-    ilike?: string;
-    notLike?: string;
-    notIlike?: string;
+    eq?: T | Placeholder;
+    ne?: T | Placeholder;
+    gt?: T | Placeholder;
+    gte?: T | Placeholder;
+    lt?: T | Placeholder;
+    lte?: T | Placeholder;
+    in?: (T | Placeholder)[] | Placeholder;
+    notIn?: (T | Placeholder)[] | Placeholder;
+    like?: string | Placeholder;
+    ilike?: string | Placeholder;
+    notLike?: string | Placeholder;
+    notIlike?: string | Placeholder;
     isNull?: true;
     isNotNull?: true;
     NOT?: RelationsFieldFilter<T>;
     OR?: RelationsFieldFilter<T>[];
 };
-export type RelationsFieldFilter<T> = T | RelationFieldsFilterInternals<T | Placeholder>;
+export type RelationsFieldFilter<T> = RelationFieldsFilterInternals<T> | (T extends Record<string, any> ? never : T);
 export type RelationsFilter<TColumns extends Record<string, Column>> = {
     [K in keyof TColumns]?: RelationsFieldFilter<TColumns[K]['_']['data']>;
 } & {
@@ -258,9 +268,7 @@ export type RelationsFilter<TColumns extends Record<string, Column>> = {
     NOT?: RelationsFilter<TColumns>;
     RAW?: (table: Simplify<AnyTable<{
         columns: TColumns;
-    }> & {
-        [K in keyof TColumns]: TColumns[K];
-    }>, operators: Operators) => SQL;
+    }> & TColumns>, operators: Operators) => SQL;
 };
 export interface OneConfig<TSchema extends Record<string, Table>, TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | Readonly<RelationsBuilderColumnBase>, TTargetTableName extends string, TOptional extends boolean> {
     from?: TSourceColumns | Writable<TSourceColumns>;
@@ -282,7 +290,7 @@ export interface ManyConfig<TSchema extends Record<string, Table>, TSourceColumn
 }
 export type AnyManyConfig = ManyConfig<Record<string, Table>, Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | Readonly<RelationsBuilderColumnBase>, string>;
 export interface OneFn<TTables extends Record<string, Table>, TTargetTableName extends string> {
-    <TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | RelationsBuilderColumnBase = any, TOptional extends boolean = false>(config?: OneConfig<TTables, TSourceColumns, TTargetTableName, TOptional>): One<TSourceColumns extends [RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]] ? TSourceColumns[number]['_']['tableName'] : Assume<TSourceColumns, RelationsBuilderColumnBase>['_']['tableName'], TTargetTableName, TOptional>;
+    <TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | RelationsBuilderColumnBase = any, TOptional extends boolean = true>(config?: OneConfig<TTables, TSourceColumns, TTargetTableName, TOptional>): One<TSourceColumns extends [RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]] ? TSourceColumns[number]['_']['tableName'] : Assume<TSourceColumns, RelationsBuilderColumnBase>['_']['tableName'], TTargetTableName, TOptional>;
 }
 export interface ManyFn<TTables extends Record<string, Table>, TTargetTableName extends string> {
     <TSourceColumns extends Readonly<[RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]]> | RelationsBuilderColumnBase = any>(config?: ManyConfig<TTables, TSourceColumns, TTargetTableName>): Many<TSourceColumns extends [RelationsBuilderColumnBase, ...RelationsBuilderColumnBase[]] ? TSourceColumns[number]['_']['tableName'] : Assume<TSourceColumns, RelationsBuilderColumnBase>['_']['tableName'], TTargetTableName>;
@@ -341,7 +349,12 @@ export declare function relationExtrasToSQL(table: Table, extras: Extras): {
         field: Column | Table | SQL | SQL.Aliased | SQLWrapper | AggregatedField;
         isArray?: boolean;
         selection?: BuildRelationalQueryResult["selection"];
+        isOptional?: boolean;
     }[];
 };
-export declare function relationToSQL(relation: Relation, sourceTable: Table, targetTable: Table): SQL | undefined;
+export type BuiltRelationFilters = {
+    filter?: SQL;
+    joinCondition?: SQL;
+};
+export declare function relationToSQL(relation: Relation, sourceTable: Table, targetTable: Table, throughTable?: Table): BuiltRelationFilters;
 export {};

package/relations.js

@@ -1,4 +1,10 @@
-import { getTableUniqueName, IsAlias, Schema, Table } from "./table.js";
+import {
+  getTableUniqueName,
+  IsAlias,
+  OriginalName,
+  Schema,
+  Table
+} from "./table.js";
 import { Columns, getTableName } from "./table.js";
 import { Column } from "./column.js";
 import { entityKind, is } from "./entity.js";
@@ -28,7 +34,7 @@ import {
   notLike,
   or
 } from "./sql/expressions/index.js";
-import { Placeholder, SQL, sql } from "./sql/sql.js";
+import { SQL, sql } from "./sql/sql.js";
 import { getTableColumns } from "./utils.js";
 class Relations {
   constructor(schema, tables, config) {
@@ -89,9 +95,30 @@ class Relations {
         if (relation.sourceColumns && relation.targetColumns) {
           if (relation.sourceColumns.length !== relation.targetColumns.length) {
             throw new Error(
-              `${relationPrintName}: "from" and "to" arrays must have the same length`
+              `${relationPrintName}: "from" and "to" fields must have the same length`
             );
           }
+          if (relation.through) {
+            if (relation.through.source.length !== relation.through.target.length || relation.through.source.length !== relation.sourceColumns.length || relation.through.target.length !== relation.targetColumns.length) {
+              throw new Error(
+                `${relationPrintName}: ".through(column)" must be used either on all columns in "from" and "to" or not defined on any of them`
+              );
+            }
+            for (const column of relation.through.source) {
+              if (column.table !== relation.throughTable) {
+                throw new Error(
+                  `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
+                );
+              }
+            }
+            for (const column of relation.through.target) {
+              if (column.table !== relation.throughTable) {
+                throw new Error(
+                  `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
+                );
+              }
+            }
+          }
           continue;
         }
         if (relation.sourceColumns || relation.targetColumns) {
@@ -151,7 +178,13 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         }
         relation.sourceColumns = reverseRelation.targetColumns;
         relation.targetColumns = reverseRelation.sourceColumns;
-        relation.where = reverseRelation.where;
+        relation.through = reverseRelation.through ? {
+          source: reverseRelation.through.target,
+          target: reverseRelation.through.source
+        } : void 0;
+        relation.throughTable = reverseRelation.throughTable;
+        relation.isReversed = !relation.where;
+        relation.where = relation.where ?? reverseRelation.where;
       }
     }
   }
@@ -171,6 +204,9 @@ class Relation {
   alias;
   where;
   sourceTable;
+  through;
+  throughTable;
+  isReversed;
 }
 class One extends Relation {
   static [entityKind] = "OneV2";
@@ -180,12 +216,30 @@ class One extends Relation {
     this.alias = config?.alias;
     this.where = config?.where;
     if (config?.from) {
-      this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
+      this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
+        this.throughTable ??= it._.through?._.column.table;
+        return it._.column;
+      });
     }
     if (config?.to) {
-      this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
+      this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
+        this.throughTable ??= it._.through?._.column.table;
+        return it._.column;
+      });
+    }
+    if (this.throughTable) {
+      this.through = Array.isArray(config?.from) ? {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+        source: config.from.map((e) => e._.through?._.column),
+        target: (config.to ?? []).map((e) => e._.column)
+      } : {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+        source: [config?.from?._.through?._.column],
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+        target: [config?.to?._.through?._.column]
+      };
     }
-    this.optional = config?.optional ?? false;
+    this.optional = config?.optional ?? true;
   }
 }
 class Many extends Relation {
@@ -195,10 +249,28 @@ class Many extends Relation {
     this.alias = config?.alias;
     this.where = config?.where;
     if (config?.from) {
-      this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
+      this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
+        this.throughTable ??= it._.through?._.column.table;
+        return it._.column;
+      });
     }
     if (config?.to) {
-      this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
+      this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
+        this.throughTable ??= it._.through?._.column.table;
+        return it._.column;
+      });
+    }
+    if (this.throughTable) {
+      this.through = Array.isArray(config?.from) ? {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+        source: config.from.map((e) => e._.through?._.column),
+        target: (config.to ?? []).map((e) => e._.column)
+      } : {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+        source: [config?.from?._.through?._.column],
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+        target: [config?.to?._.through?._.column]
+      };
     }
   }
   static [entityKind] = "ManyV2";
@@ -218,7 +290,8 @@ class Count extends AggregatedField {
     if (!this.query) {
       if (!this.table)
         throw new Error("Table must be set before building aggregate field");
-      this.query = sql`select count(*) as ${sql.identifier("r")} from ${this.table}`.mapWith(Number);
+      const table = this.table;
+      this.query = sql`select count(*) as ${sql.identifier("r")} from ${table[IsAlias] ? sql`${sql`${sql.identifier(table[Schema] ?? "")}.`.if(table[Schema])}${sql.identifier(table[OriginalName])} as ${table}` : table}`.mapWith(Number);
     }
     return this.query;
   }
@@ -255,24 +328,33 @@ const orderByOperators = {
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false, path) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table)) {
+      const currentPath = `${path ? `${path}.` : ""}${selectionItem.key}`;
       if (row[selectionItem.key] === null)
         continue;
       if (parseJson)
         row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       if (selectionItem.isArray) {
         for (const item of row[selectionItem.key]) {
-          mapRelationalRow(item, selectionItem.selection, mapColumnValue);
+          mapRelationalRow(
+            item,
+            selectionItem.selection,
+            mapColumnValue,
+            false,
+            currentPath
+          );
         }
         continue;
       }
       mapRelationalRow(
         row[selectionItem.key],
         selectionItem.selection,
-        mapColumnValue
+        mapColumnValue,
+        false,
+        currentPath
       );
       continue;
     }
@@ -309,16 +391,16 @@ class RelationsBuilderTable {
 class RelationsBuilderColumn {
   static [entityKind] = "RelationsBuilderColumn";
   _;
-  constructor(column) {
+  constructor(column, through) {
     this._ = {
       tableName: getTableName(column.table),
       data: void 0,
-      column
+      column,
+      through
     };
   }
   through(column) {
-    this._.through = column;
-    return this;
+    return new RelationsBuilderColumn(this._.column, column);
   }
   getSQL() {
     return this._.column.getSQL();
@@ -382,7 +464,7 @@ function defineRelations(schema, relations) {
   );
 }
 function relationsFieldFilterToSQL(column, filter) {
-  if (typeof filter !== "object" || is(filter, Placeholder))
+  if (typeof filter !== "object")
     return eq(column, filter);
   const entries = Object.entries(filter);
   if (!entries.length)
@@ -409,6 +491,21 @@ function relationsFieldFilterToSQL(column, filter) {
         );
         continue;
       }
+      case "isNotNull":
+      case "isNull": {
+        if (!value)
+          continue;
+        parts.push(operators[target](column));
+        continue;
+      }
+      case "in": {
+        parts.push(operators.inArray(column, value));
+        continue;
+      }
+      case "notIn": {
+        parts.push(operators.notInArray(column, value));
+        continue;
+      }
       default: {
         parts.push(
           operators[target](
@@ -436,7 +533,7 @@ function relationsFilterToSQL(table, filter) {
       case "RAW": {
         if (value) {
           parts.push(
-            value(table[Columns], operators)
+            value(table, operators)
           );
         }
         continue;
@@ -506,16 +603,44 @@ function relationExtrasToSQL(table, extras) {
     selection
   };
 }
-function relationToSQL(relation, sourceTable, targetTable) {
+function relationToSQL(relation, sourceTable, targetTable, throughTable) {
+  if (relation.through) {
+    const outerColumnWhere = relation.sourceColumns.map((s, i) => {
+      const t = relation.through.source[i];
+      return eq(
+        sql`${sourceTable}.${sql.identifier(s.name)}`,
+        sql`${throughTable}.${sql.identifier(t.name)}`
+      );
+    });
+    const innerColumnWhere = relation.targetColumns.map((s, i) => {
+      const t = relation.through.target[i];
+      return eq(
+        sql`${throughTable}.${sql.identifier(t.name)}`,
+        sql`${targetTable}.${sql.identifier(s.name)}`
+      );
+    });
+    return {
+      filter: and(
+        relation.where ? relation.isReversed ? relationsFilterToSQL(targetTable, relation.where) : relationsFilterToSQL(sourceTable, relation.where) : void 0
+      ),
+      joinCondition: and(
+        ...outerColumnWhere,
+        ...innerColumnWhere
+      )
+    };
+  }
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${sql`${sql`${sql.identifier(sourceTable[Schema] ?? "")}.`.if(sourceTable[Schema] && !sourceTable[IsAlias])}`}${sourceTable}.${sql.identifier(s.name)}`,
-      sql`${sql`${sql`${sql.identifier(targetTable[Schema] ?? "")}.`.if(targetTable[Schema] && !targetTable[IsAlias])}`}${targetTable}.${sql.identifier(t.name)}`
+      sql`${sourceTable}.${sql.identifier(s.name)}`,
+      sql`${targetTable}.${sql.identifier(t.name)}`
     );
   });
-  const targetWhere = relation.where ? and(...columnWhere, relationsFilterToSQL(sourceTable, relation.where)) : and(...columnWhere);
-  return targetWhere;
+  const fullWhere = and(
+    ...columnWhere,
+    relation.where ? relation.isReversed ? relationsFilterToSQL(targetTable, relation.where) : relationsFilterToSQL(sourceTable, relation.where) : void 0
+  );
+  return { filter: fullWhere };
 }
 export {
   AggregatedField,