prisma-ts-select 0.1.6 → 0.1.8

package/dist/extend/extend.d.ts

@@ -4,6 +4,7 @@ import { S as SQLExpr, L as LitToType } from './sql-expr-BGSEwzCi.js';
 type PrismaClient = any;
 
 declare const DB: DBType;
+type M2MMap = {};
 type TDB = typeof DB;
 type DeepWriteable<T> = {
     -readonly [P in keyof T]: DeepWriteable<T[P]>;
@@ -236,7 +237,7 @@ type WhereCriteriaMulti<T extends TArrSources, TFields extends TFieldsType, F =
 type WhereCriteria<T extends TArrSources, TFields extends TFieldsType> = T['length'] extends 1 ? T[0] extends TVirtualTableSource ? WhereCriteriaMulti<T, TFields> : WhereCriteriaSingle<TFields[GetAliasTableNames<T[0]>]> : WhereCriteriaMulti<T, TFields>;
 type JoinWhereCriteria<Table extends string, TAlias extends string | never> = [
     TAlias
-] extends [never] ? WhereCriteriaMulti<[Table], Record<Table, GetFieldsFromTable<Table>>> : WhereCriteriaMulti<[[Table, TAlias]], Record<TAlias, GetFieldsFromTable<Table>>>;
+] extends [never] ? WhereCriteriaMulti<[Table], Record<Table, GetFieldsFromTable<Table>>> : WhereCriteriaMulti<[[Table, TAlias]], Record<Table, GetFieldsFromTable<Table>>>;
 type WhereCriteria_Fields<T extends Array<TTableSources>, TFields extends TFieldsType, acc = {}> = T extends readonly [infer HEAD, ...infer Rest] ? HEAD extends string ? Rest extends Array<TTableSources> ? WhereCriteria_Fields<Rest, TFields, OptionalObject<acc & (TableFieldType<HEAD, TFields[HEAD]> | SQLCondition<TableFieldType<HEAD, TFields[HEAD]>>)>> : WhereCriteria_Fields<[], TFields, OptionalObject<acc & (TableFieldType<HEAD, TFields[HEAD]> | SQLCondition<TableFieldType<HEAD, TFields[HEAD]>>)>> : HEAD extends readonly ["__cte__", infer CTE_NAME extends string] ? Rest extends Array<TTableSources> ? WhereCriteria_Fields<Rest, TFields, OptionalObject<acc & (TableFieldType<CTE_NAME, TFields[CTE_NAME]> | SQLCondition<TableFieldType<CTE_NAME, TFields[CTE_NAME]>>)>> : WhereCriteria_Fields<[], TFields, OptionalObject<acc & (TableFieldType<CTE_NAME, TFields[CTE_NAME]> | SQLCondition<TableFieldType<CTE_NAME, TFields[CTE_NAME]>>)>> : HEAD extends [infer R_NAME extends string, infer A_NAME extends string] ? Rest extends Array<TTableSources> ? WhereCriteria_Fields<Rest, TFields, OptionalObject<acc & (TableFieldType<A_NAME, TFields[R_NAME]> | SQLCondition<TableFieldType<A_NAME, TFields[R_NAME]>>)>> : WhereCriteria_Fields<[], TFields, OptionalObject<acc & (TableFieldType<A_NAME, TFields[R_NAME]> | SQLCondition<TableFieldType<A_NAME, TFields[R_NAME]>>)>> : never : acc;
 type OnlyNull<T, R> = T extends null ? R : never;
 type FindColsWithNull<TFields extends TFieldsType> = Prettify<{
@@ -306,6 +307,9 @@ type FieldsByTypeByTable = Prettify<{
 }>;
 type GetColumnType<Table extends TTableSources, Col1 extends keyof _db[Table extends string ? Table : `Come back to 8`]["fields"]> = RemoveNullChar<IsString<_db[Table extends string ? Table : `Come back to 9`]["fields"][Col1]>>;
 type GetJoinOnColsType<Type extends string, TSources extends TArrSources> = GetJoinColsType<TSources[number], Type>;
+type GetCTECols<TCTEs extends Record<string, Record<string, any>>> = {
+    [K in keyof TCTEs & string]: `${K}.${keyof TCTEs[K] & string}`;
+}[keyof TCTEs & string];
 type GetColsFromTableType<TDBBase extends TTableSources, Type extends string> = FieldsByTypeByTable[Loop<keyof FieldsByTypeByTable, Type>][GetRealTableNames<TDBBase>];
 type Loop<Keys extends string, Type extends string> = Keys extends Type ? Type : never;
 type GetJoinColsType<TDBBase extends TTableSources, Type extends string> = IterateFields<TDBBase, IsString<GetColsFromTableType<TDBBase, Type>>>;
@@ -335,7 +339,7 @@ type BaseSelectFnContext<_TSources extends TArrSources, _TFields extends TFields
     ltrim: (col: GetColumnsOfType<_TSources, _TFields, string> | SQLExpr<string>) => SQLExpr<string>;
     rtrim: (col: GetColumnsOfType<_TSources, _TFields, string> | SQLExpr<string>) => SQLExpr<string>;
     cond: (criteria: WhereCriteria<_TSources, _TFields>) => SQLExpr<boolean>;
-    coalesce: <T>(...args: [GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>, ...Array<GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>>]) => SQLExpr<T>;
+    coalesce: <T>(...args: [GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>, ...Array<GetColumnsOfType<_TSources, _TFields, T> | SQLExpr<T>>]) => SQLExpr<NonNullable<T>>;
     nullif: <T>(expr1: SQLExpr<T>, expr2: SQLExpr<T>) => SQLExpr<T | null>;
     caseWhen: <T, TElse extends SQLExpr<T> | undefined = undefined>(cases: [{
         when: WhereCriteria<_TSources, _TFields>;
@@ -346,12 +350,15 @@ type BaseSelectFnContext<_TSources extends TArrSources, _TFields extends TFields
     }>], elseVal?: TElse) => TElse extends SQLExpr<T> ? SQLExpr<T> : SQLExpr<T | null>;
 };
 type SelectFnContext<_TSources extends TArrSources, _TFields extends TFieldsType> = BaseSelectFnContext<_TSources, _TFields>;
-type ImplicitJoinsFrom<TSources extends TArrSources> = AvailableJoins<TSources> & `_${string}`;
-type AvailableM2MTargets<TSources extends TArrSources> = keyof Relations<ImplicitJoinsFrom<TSources>> extends infer T ? T extends TTables & string ? T extends `_${string}` ? never : T : never : never;
-type GetJunctionTable<TSource extends TTables, TTarget extends TTables> = keyof Relations<TSource> & keyof Relations<TTarget> & `_${string}` & TTables;
-type AvailableRefNames<TSources extends TArrSources> = ImplicitJoinsFrom<TSources> extends `_${infer R}` ? R : never;
+type IsUnion<T, _T extends T = T> = _T extends _T ? ([T] extends [_T] ? false : true) : never;
+type ResolveSourceTable<TSources extends TArrSources, TInput extends string> = TSources[number] extends infer T ? T extends TVirtualTableSource ? never : T extends string ? T extends TInput ? T & TTables : never : T extends [infer Table extends TTables, infer Alias extends string] ? Alias extends TInput ? Table : Table extends TInput ? Table : never : never : never;
+type AvailableM2MSources<TSources extends TArrSources> = TSources[number] extends infer T ? T extends TVirtualTableSource ? never : T extends string ? T extends keyof M2MMap ? T : never : T extends [infer Table extends string, infer Alias extends string] ? Table extends keyof M2MMap ? Alias : never : never : never;
+type AvailableM2MTargets<TSource extends TTables> = TSource extends keyof M2MMap ? keyof M2MMap[TSource] & string : never;
+type GetJunctionTable<TSource extends TTables, TTarget extends TTables> = TSource extends keyof M2MMap ? TTarget extends keyof M2MMap[TSource] ? M2MMap[TSource][TTarget & keyof M2MMap[TSource]] & TTables : never : never;
+type AvailableRefNames<TSource extends TTables> = TSource extends keyof M2MMap ? M2MMap[TSource][keyof M2MMap[TSource]] extends infer J ? J extends `_${infer R}` ? R : never : never : never;
 declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType, TCTEs extends Record<string, Record<string, any>> = {}> extends _fWhere<TSources, TFields> {
     join<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
         joinType?: JoinType;
     }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     join<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
@@ -367,7 +374,7 @@ declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType,
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     private _joinImpl;
-    joinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    joinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
@@ -375,7 +382,7 @@ declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType,
         where?: JoinWhereCriteria<Table, TAlias>;
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    joinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+    joinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
         where?: JoinWhereCriteria<Table, TAlias>;
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
@@ -391,99 +398,172 @@ declare class _fJoin<TSources extends TArrSources, TFields extends TFieldsType,
         where?: JoinWhereCriteria<Table, TAlias>;
         joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    manyToManyJoin<const TTableInput extends `${AvailableM2MTargets<TSources>}` | `${AvailableM2MTargets<TSources>} ${string}`, TTarget extends AvailableM2MTargets<TSources> = ExtractTableName<TTableInput> & AvailableM2MTargets<TSources>, TAlias extends string | never = ExtractAlias<TTableInput>, const TRefName extends AvailableRefNames<TSources> | undefined = undefined, TJunction extends TTables = TRefName extends string ? `_${TRefName}` & TTables : GetJunctionTable<GetRealTableNames<TSources[number]>, TTarget>>(targetTable: TTableInput, options?: {
-        source?: `${GetAliasTableNames<TSources[number]>}.${string}`;
-        refName?: TRefName;
-    }): _fJoin<[
+    manyToManyJoin<const TSourceInput extends AvailableM2MSources<TSources>, TSource extends TTables = ResolveSourceTable<TSources, TSourceInput>, const TTargetInput extends `${AvailableM2MTargets<TSource>}` | `${AvailableM2MTargets<TSource>} ${string}` = never, TTarget extends TTables = ExtractTableName<TTargetInput> & TTables, TAlias extends string | never = ExtractAlias<TTargetInput>, const TRefName extends AvailableRefNames<TSource> | undefined = undefined, TJunction extends TTables = TRefName extends string ? `_${TRefName}` & TTables : GetJunctionTable<TSource, TTarget>>(sourceTable: TSourceInput, targetTable: TTargetInput, ...args: IsUnion<TJunction> extends true ? [options: {
+        refName: AvailableRefNames<TSource>;
+    }] : [options?: {
+        refName?: AvailableRefNames<TSource>;
+    }]): _fJoin<[
         ...TSources,
         TJunction,
         [TAlias] extends [never] ? TTarget : [TTarget, TAlias]
     ], Prettify<TFields & Record<TJunction, GetFieldsFromTable<TJunction>> & Record<[TAlias] extends [never] ? TTarget : TAlias, GetFieldsFromTable<TTarget>>>>;
+    innerJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     innerJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    innerJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    innerJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    leftJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     leftJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    leftJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    leftJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    rightJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     rightJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    rightJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    rightJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    fullJoin<const TName extends keyof TCTEs & string>(cteName: TName, local: keyof TCTEs[TName] & string, remote: GetJoinCols<TSources[number]>, opts?: {
+        where?: WhereCriteriaMulti<[readonly ["__cte__", TName]], Record<TName, TCTEs[TName]>>;
+    }): _fJoin<[...TSources, readonly ["__cte__", TName]], TFields & Record<TName, TCTEs[TName]>, TCTEs>;
     fullJoin<const Table extends AvailableJoins<TSources>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: find<TJoinCols, TCol1>;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    fullJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    fullJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>, TJoinCols extends [string, string] = ValidStringTuple<GetUnionOfRelations<MapJoinsToKnownTables<SafeJoins<Table, TSources>, TSources>>>, TCol1 extends TJoinCols[0] = never>(table: TableInput, field: TCol1, reference: find<TJoinCols, TCol1>, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [never] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
     crossJoin<const TableInput extends `${AvailableJoins<TSources>}` | `${AvailableJoins<TSources>} ${string}`, Table extends AvailableJoins<TSources> = ExtractTableName<TableInput> & AvailableJoins<TSources>, TAlias extends string | never = ExtractAlias<TableInput>>(table: TableInput): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    innerJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    innerJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    innerJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    innerJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     innerJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
+    innerJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    innerJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    leftJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    leftJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    leftJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    leftJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
     leftJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
-    leftJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
-    rightJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    leftJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], TFields & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
+    rightJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
-    rightJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
+    rightJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     rightJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    rightJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
-    fullJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>, TAlias extends string = never>(options: {
+    rightJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, GetFieldsFromTable<Table>>, TCTEs>;
+    fullJoinUnsafeTypeEnforced<const Table extends TTables | `${TTables} ${string}`, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [undefined] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
-    fullJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
+    fullJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]> | GetCTECols<TCTEs> = GetJoinOnColsType<GetColumnType<Table, TCol1>, [...TSources, Table]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<NullifyTableFields<TFields> & Record<[TAlias] extends [undefined] ? Table : TAlias, MakeNullable<GetFieldsFromTable<Table>>>>, TCTEs>;
     fullJoinUnsafeIgnoreType<const Table extends TTables, TCol1 extends GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]>, TAlias extends string = never>(options: {
         table: Table;
         src: TCol1;
         on: TCol2;
         alias?: TAlias;
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
+    }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
+    fullJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2, options?: {
+        where?: JoinWhereCriteria<Table, TAlias>;
+        joinType?: JoinType;
     }): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
-    fullJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>, TCol1 extends GetColsBaseTable<Table> = GetColsBaseTable<Table>, TCol2 extends GetJoinCols<TSources[number]> = GetJoinCols<TSources[number]>>(table: TableInput, field: TCol1, reference: TCol2): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], NullifyTableFields<TFields> & Record<Table, MakeNullable<GetFieldsFromTable<Table>>>, TCTEs>;
     crossJoinUnsafeTypeEnforced<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>>(table: TableInput): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
     crossJoinUnsafeIgnoreType<const TableInput extends TTables | `${TTables} ${string}`, Table extends TTables = ExtractTableName<TableInput>, TAlias extends string | never = ExtractAlias<TableInput>>(table: TableInput): _fJoinReturn<[...TSources, [TAlias] extends [never] ? Table : [Table, TAlias]], Prettify<TFields & Record<[TAlias] extends [never] ? Table : TAlias, GetFieldsFromTable<Table>>>, TCTEs>;
 }

package/dist/extend/extend.js

@@ -284,6 +284,7 @@ var esc = (s2) => s2.replace(/'/g, "''");
 
 // src/extend.ts
 var DB = {};
+var SAFE_IDENT_RE = /^\w+$/;
 var DbSelect = class {
   constructor(db) {
     this.db = db;
@@ -299,17 +300,25 @@ var DbSelect = class {
   }
 };
 function applyCondition(quotedField, value) {
+  const sqlVal = (v2) => {
+    if (typeof v2 === "string") return `'${esc(v2)}'`;
+    if (v2 instanceof Date) return `'${v2.toISOString()}'`;
+    if (v2 === null) return "NULL";
+    if (typeof v2 === "number" || typeof v2 === "bigint" || typeof v2 === "boolean")
+      return String(v2);
+    throw new Error(`Unsupported value type in sqlVal: ${typeof v2}`);
+  };
   if (typeof value === "object" && value !== null && !Array.isArray(value) && "op" in value) {
     const opObj = value;
     switch (opObj.op) {
       case "IN":
       case "NOT IN": {
-        const valuesList = opObj.values.map((v2) => typeof v2 === "string" ? `'${esc(v2)}'` : v2).join(", ");
+        const valuesList = opObj.values.map((v2) => sqlVal(v2)).join(", ");
         return `${quotedField} ${opObj.op} (${valuesList})`;
       }
       case "BETWEEN": {
         const [start, end] = opObj.values;
-        return `${quotedField} BETWEEN ${typeof start === "string" ? `'${esc(start)}'` : start} AND ${typeof end === "string" ? `'${esc(end)}'` : end}`;
+        return `${quotedField} BETWEEN ${sqlVal(start)} AND ${sqlVal(end)}`;
       }
       case "LIKE":
       case "NOT LIKE":
@@ -323,7 +332,7 @@ function applyCondition(quotedField, value) {
       case "<=":
       case "!=":
       case "=":
-        return `${quotedField} ${opObj.op} ${typeof opObj.value === "string" ? `'${esc(opObj.value)}'` : opObj.value}`;
+        return `${quotedField} ${opObj.op} ${sqlVal(opObj.value)}`;
       default:
         throw new Error(`Unsupported operation: ${opObj.op}`);
     }
@@ -335,10 +344,10 @@ function applyCondition(quotedField, value) {
       const parts = value.map((opObj) => applyCondition(quotedField, opObj));
       return parts.length === 1 ? parts[0] : "(" + parts.join(" OR ") + ")";
     }
-    const valuesList = value.map((v2) => typeof v2 === "string" ? `'${esc(v2)}'` : v2).join(", ");
+    const valuesList = value.map((v2) => sqlVal(v2)).join(", ");
     return `${quotedField} IN (${valuesList})`;
   } else {
-    return `${quotedField} = ${typeof value === "string" ? `'${esc(value)}'` : value}`;
+    return `${quotedField} = ${sqlVal(value)}`;
   }
 }
 function processConditions(condition, formatted = false) {
@@ -532,7 +541,7 @@ var _fSelect = class __fSelect extends _fOrderBy {
         }
         return new __fSelect(this.db, {
           ...this.values,
-          selects: [...this.values.selects, `${dialect.quoteQualifiedColumn(select)} AS ${dialect.quote(select, true)}`]
+          selects: [...this.values.selects, `${dialect.quoteQualifiedColumn(select)} AS ${dialect.quote(alias ?? select, true)}`]
         });
       }
       if (colName === "*") {
@@ -793,98 +802,98 @@ var _fJoin = class __fJoin extends _fWhere {
   joinUnsafeIgnoreType(tableOrOptions, field, reference, _opts) {
     return this.join(tableOrOptions, field, reference, _opts);
   }
-  manyToManyJoin(targetTable, options) {
-    const opts = options;
+  manyToManyJoin(sourceTable, targetTable, ...args) {
+    const opts = args[0];
     const refName = opts?.refName;
+    const safeIdent = (v2, ctx) => {
+      if (!SAFE_IDENT_RE.test(v2)) throw new Error(`manyToManyJoin: unsafe identifier in ${ctx}: "${v2}"`);
+      return v2;
+    };
+    const [sourceTblRaw] = sourceTable.split(" ");
+    const safeSourceTbl = safeIdent(sourceTblRaw, "source");
+    const sourceEntry = this.values.tables.find(
+      (t2) => t2.table === safeSourceTbl || t2.alias === safeSourceTbl
+    );
+    if (!sourceEntry) throw new Error(`manyToManyJoin: source "${safeSourceTbl}" not in joined tables (by table name or alias)`);
+    const sourceTableName = sourceEntry.table;
+    const sourceAlias = sourceEntry.alias || sourceEntry.table;
     const [tbl, alias] = targetTable.split(" ");
-    let sourceTableName;
-    let sourceAlias;
-    let srcLocalCol;
-    if (opts?.source) {
-      const [srcAliasOrTable, col] = opts.source.split(".");
-      const entry = this.values.tables.find((t2) => (t2.alias || t2.table) === srcAliasOrTable);
-      sourceTableName = entry?.table ?? srcAliasOrTable;
-      sourceAlias = srcAliasOrTable;
-      srcLocalCol = col;
-    } else {
-      const candidates = this.values.tables.filter((entry) => {
-        const relations = DB[entry.table]?.relations;
-        return relations && Object.keys(relations).some(
-          (k2) => k2.startsWith("_") && DB[k2]?.relations?.[tbl] !== void 0
-        );
-      });
-      if (candidates.length === 0) throw new Error(
-        `manyToManyJoin: no source with junction to "${tbl}" among joined tables`
-      );
-      if (candidates.length > 1) {
-        const names = candidates.map((c2) => c2.alias ?? c2.table).join(", ");
-        throw new Error(`manyToManyJoin: ambiguous source for "${tbl}" (${names}). Pass { source: "alias.col" }.`);
-      }
-      const found = candidates[0];
-      sourceTableName = found.table;
-      sourceAlias = found.alias || found.table;
-      const srcRelations2 = DB[sourceTableName]?.relations;
-      const junctionKey = refName ? `_${refName}` : Object.keys(srcRelations2 ?? {}).find(
-        (k2) => k2.startsWith("_") && DB[k2]?.relations?.[tbl] !== void 0
-      );
-      const junctionRelEntry = junctionKey ? srcRelations2[junctionKey] : void 0;
-      srcLocalCol = junctionRelEntry ? Object.keys(junctionRelEntry)[0] : "id";
-    }
+    const safeTbl = safeIdent(tbl, "target");
+    const safeAlias = alias ? safeIdent(alias, "alias") : void 0;
+    const safeRef = refName ? safeIdent(refName, "refName") : void 0;
     const srcEntry = DB[sourceTableName];
     if (!srcEntry) throw new Error(`manyToManyJoin: unknown source table "${sourceTableName}"`);
     const srcRelations = srcEntry.relations;
-    const junctionTable = refName ? `_${refName}` : Object.keys(srcRelations).find(
-      (k2) => k2.startsWith("_") && DB[k2]?.relations?.[tbl] !== void 0
+    const junctionTable = safeRef ? `_${safeRef}` : Object.keys(srcRelations).find(
+      (k2) => k2.startsWith("_") && DB[k2]?.relations?.[safeTbl] !== void 0
     );
     if (!junctionTable) throw new Error(
-      `manyToManyJoin: no junction between "${sourceTableName}" and "${tbl}"`
+      `manyToManyJoin: no junction between "${sourceTableName}" and "${safeTbl}"`
+    );
+    const junctionRelEntry = srcRelations[junctionTable];
+    const junctionKeys = junctionRelEntry ? Object.keys(junctionRelEntry) : [];
+    if (junctionRelEntry && junctionKeys.length === 0) throw new Error(
+      `manyToManyJoin: junction "${junctionTable}" has no relation columns for source "${sourceTableName}"`
+    );
+    const srcLocalCol = junctionKeys[0] ?? (() => {
+      throw new Error(`manyToManyJoin: cannot determine source local col for junction "${junctionTable}"`);
+    })();
+    const srcJunctionCol = junctionRelEntry?.[srcLocalCol]?.[0] ?? (() => {
+      throw new Error(`manyToManyJoin: cannot determine source junction col for "${junctionTable}"`);
+    })();
+    const tgtRelEntry = DB[junctionTable]?.relations?.[safeTbl];
+    const tgtKeys = tgtRelEntry ? Object.keys(tgtRelEntry) : [];
+    if (tgtRelEntry && tgtKeys.length === 0) throw new Error(
+      `manyToManyJoin: junction "${junctionTable}" has no relation columns for target "${safeTbl}"`
     );
-    const srcJunctionCol = srcRelations[junctionTable]?.[srcLocalCol]?.[0] ?? "A";
-    const tgtRelEntry = DB[junctionTable]?.relations?.[tbl];
-    const tgtJunctionCol = tgtRelEntry ? Object.keys(tgtRelEntry)[0] : "B";
-    const tgtLocalCol = tgtRelEntry?.[tgtJunctionCol]?.[0] ?? "id";
+    const tgtJunctionCol = tgtKeys[0] ?? (() => {
+      throw new Error(`manyToManyJoin: cannot determine target junction col for "${junctionTable}"`);
+    })();
+    const tgtLocalCol = tgtRelEntry?.[tgtJunctionCol]?.[0] ?? (() => {
+      throw new Error(`manyToManyJoin: cannot determine target local col for "${junctionTable}"`);
+    })();
     const remoteRef = `${sourceAlias}.${srcLocalCol}`;
-    return this.joinUnsafeIgnoreType(junctionTable, srcJunctionCol, remoteRef).joinUnsafeIgnoreType(alias ? `${tbl} ${alias}` : tbl, tgtLocalCol, `${junctionTable}.${tgtJunctionCol}`);
+    return this.joinUnsafeIgnoreType(junctionTable, srcJunctionCol, remoteRef).joinUnsafeIgnoreType(safeAlias ? `${safeTbl} ${safeAlias}` : safeTbl, tgtLocalCol, `${junctionTable}.${tgtJunctionCol}`);
   }
-  innerJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("INNER", tableOrOptions, field, reference);
+  innerJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("INNER", tableOrOptions, field, reference, opts);
   }
-  leftJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("LEFT", tableOrOptions, field, reference);
+  leftJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("LEFT", tableOrOptions, field, reference, opts);
   }
-  rightJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("RIGHT", tableOrOptions, field, reference);
+  rightJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("RIGHT", tableOrOptions, field, reference, opts);
   }
-  fullJoin(tableOrOptions, field, reference) {
-    return this._joinImpl("FULL", tableOrOptions, field, reference);
+  fullJoin(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("FULL", tableOrOptions, field, reference, opts);
   }
   // crossJoin: no ON clause — table only (with optional inline alias)
   crossJoin(table) {
     return this._joinImpl("CROSS", table);
   }
-  innerJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("INNER", tableOrOptions, field, reference);
+  innerJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("INNER", tableOrOptions, field, reference, opts);
   }
-  innerJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("INNER", tableOrOptions, field, reference);
+  innerJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("INNER", tableOrOptions, field, reference, opts);
   }
-  leftJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("LEFT", tableOrOptions, field, reference);
+  leftJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("LEFT", tableOrOptions, field, reference, opts);
   }
-  leftJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("LEFT", tableOrOptions, field, reference);
+  leftJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("LEFT", tableOrOptions, field, reference, opts);
   }
-  rightJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("RIGHT", tableOrOptions, field, reference);
+  rightJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("RIGHT", tableOrOptions, field, reference, opts);
   }
-  rightJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("RIGHT", tableOrOptions, field, reference);
+  rightJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("RIGHT", tableOrOptions, field, reference, opts);
   }
-  fullJoinUnsafeTypeEnforced(tableOrOptions, field, reference) {
-    return this._joinImpl("FULL", tableOrOptions, field, reference);
+  fullJoinUnsafeTypeEnforced(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("FULL", tableOrOptions, field, reference, opts);
   }
-  fullJoinUnsafeIgnoreType(tableOrOptions, field, reference) {
-    return this._joinImpl("FULL", tableOrOptions, field, reference);
+  fullJoinUnsafeIgnoreType(tableOrOptions, field, reference, opts) {
+    return this._joinImpl("FULL", tableOrOptions, field, reference, opts);
   }
   // crossJoinUnsafeTypeEnforced — CROSS semantics, type-enforced columns
   crossJoinUnsafeTypeEnforced(table) {

package/dist/generator.cjs

@@ -1,4 +1,10 @@
 'use strict';
 
-require('./chunk-GSIFF2TF.cjs');
+var chunkRX2M26LV_cjs = require('./chunk-RX2M26LV.cjs');
 
+
+
+Object.defineProperty(exports, "generateM2MMapDeclaration", {
+  enumerable: true,
+  get: function () { return chunkRX2M26LV_cjs.generateM2MMapDeclaration; }
+});

package/dist/generator.d.cts

@@ -1,2 +1,3 @@
+declare function generateM2MMapDeclaration(m2mMap: Record<string, Record<string, Set<string>>>): string;
 
-export {  }
+export { generateM2MMapDeclaration };

package/dist/generator.d.ts

@@ -1,2 +1,3 @@
+declare function generateM2MMapDeclaration(m2mMap: Record<string, Record<string, Set<string>>>): string;
 
-export {  }
+export { generateM2MMapDeclaration };

package/dist/generator.js

@@ -1 +1 @@
-import './chunk-NFKUA5XM.js';
+export { generateM2MMapDeclaration } from './chunk-F7HSD6UA.js';