durcno 1.0.0-alpha.4 → 1.0.0-alpha.6

package/README.md

@@ -40,7 +40,7 @@ npm exec durcno init
 
 Get started with Durcno by following our comprehensive documentation.
 
-**[Read the Documentation](https://durcno.dev/docs)**
+**[Read the Documentation](https://durcno.dev/docs/latest/intro)**
 
 > [!WARNING]
 > Durcno is currently in the alpha stage.

package/dist/bin.cjs

@@ -12063,13 +12063,16 @@ var Column = class {
 };
 
 // src/constraints/check.ts
+function isExprColumnRef(value) {
+  return typeof value === "object" && value !== null && value.type === "col";
+}
 function snapshotExprToSQL(expr) {
   if (expr.type === "raw") {
     return expr.sql;
   }
   if (expr.type === "comparison") {
-    const left = typeof expr.left === "string" ? `"${expr.left}"` : snapshotExprToSQL(expr.left);
-    const right = formatSnapshotValue(expr.right);
+    const left = isExprColumnRef(expr.left) ? `"${expr.left.name}"` : snapshotExprToSQL(expr.left);
+    const right = isExprColumnRef(expr.right) ? `"${expr.right.name}"` : expr.right;
     return `${left} ${expr.op} ${right}`;
   }
   if (expr.type === "logical") {
@@ -12078,24 +12081,11 @@ function snapshotExprToSQL(expr) {
     return wrappedParts.join(` ${expr.op} `);
   }
   if (expr.type === "function") {
-    const args = expr.args.map(
-      (a) => typeof a === "string" ? `"${a}"` : formatSnapshotValue(a)
-    );
+    const args = expr.args.map((a) => isExprColumnRef(a) ? `"${a.name}"` : a);
     return `${expr.name}(${args.join(", ")})`;
   }
   throw new Error("Unknown expression type");
 }
-function formatSnapshotValue(value) {
-  if (value === null) return "NULL";
-  if (Array.isArray(value)) {
-    const list = value.map((v) => formatSnapshotValue(v)).join(", ");
-    return `(${list})`;
-  }
-  if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
-  if (typeof value === "number") return String(value);
-  if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-  return String(value);
-}
 
 // src/cli/utils.ts
 function getOrderedDependencies(items, dependencyMap) {
@@ -13508,7 +13498,7 @@ async function status(options) {
 }
 
 // src/cli/index.ts
-program.version("1.0.0-alpha.3");
+program.version("1.0.0-alpha.5");
 var Options = {
   config: ["--config <path>", "Path to the config file"]
 };

package/dist/src/columns/bigint.d.mts

@@ -3,18 +3,18 @@ import { Column, ColumnConfig } from "./common.mjs";
 import * as z from "zod";
 
 //#region src/columns/bigint.d.ts
-type BigintValType = number;
+type BigintValType = bigint;
 type BigintConfig = ColumnConfig;
 declare class BigintColumn<TConfig extends BigintConfig> extends Column<TConfig, BigintValType> {
   static readonly id = "Column.Bigint";
   get sqlTypeScalar(): string;
   get sqlCastScalar(): null;
-  get zodTypeScaler(): z.ZodCoercedNumber<unknown>;
-  toDriverScalar(value: BigintValType | Sql | null): string | number | null;
-  toSQLScalar(value: number | Sql | null): string;
-  fromDriverScalar(value: number | string | null): BigintValType | null;
+  get zodTypeScaler(): z.ZodCoercedBigInt<unknown>;
+  toDriverScalar(value: BigintValType | Sql | null): string | null;
+  toSQLScalar(value: BigintValType | Sql | null): string;
+  fromDriverScalar(value: bigint | string | null): BigintValType | null;
 }
-/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `number`. */
+/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `bigint`. */
 declare function bigint<TConfig extends BigintConfig>(config: TConfig): BigintColumn<TConfig>;
 //#endregion
 export { BigintColumn, bigint };

package/dist/src/columns/bigint.mjs

@@ -11,11 +11,11 @@ var BigintColumn = class extends Column {
 		return null;
 	}
 	get zodTypeScaler() {
-		return z.coerce.number();
+		return z.coerce.bigint();
 	}
 	toDriverScalar(value) {
 		if (value === null) return null;
-		return value instanceof Sql ? value.string : value;
+		return value instanceof Sql ? value.string : value.toString();
 	}
 	toSQLScalar(value) {
 		if (value === null) return "NULL";
@@ -24,10 +24,10 @@ var BigintColumn = class extends Column {
 	}
 	fromDriverScalar(value) {
 		if (value === null) return null;
-		return typeof value === "string" ? parseInt(value, 10) : value;
+		return BigInt(value);
 	}
 };
-/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `number`. */
+/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `bigint`. */
 function bigint(config) {
 	return new BigintColumn(config);
 }

package/dist/src/columns/bigserial.d.mts

@@ -3,7 +3,7 @@ import { Column, ColumnConfig } from "./common.mjs";
 import * as z from "zod";
 
 //#region src/columns/bigserial.d.ts
-type BigserialValType = number;
+type BigserialValType = bigint;
 type BigserialConfig = Pick<ColumnConfig, "primaryKey" | "unique">;
 type BigserialInternalConfig<TConfig extends BigserialConfig> = TConfig & {
   generated: "BY DEFAULT";
@@ -14,12 +14,12 @@ declare class BigserialColumn<TConfig extends BigserialConfig> extends Column<Bi
   constructor(config: TConfig);
   get sqlTypeScalar(): string;
   get sqlCastScalar(): null;
-  get zodTypeScaler(): z.ZodCoercedNumber<unknown>;
-  toDriverScalar(value: BigserialValType | Sql | null): string | number | null;
-  toSQLScalar(value: number | Sql | null): string;
-  fromDriverScalar(value: number | string | null): BigserialValType | null;
+  get zodTypeScaler(): z.ZodCoercedBigInt<unknown>;
+  toDriverScalar(value: BigserialValType | Sql | null): string | null;
+  toSQLScalar(value: BigserialValType | Sql | null): string;
+  fromDriverScalar(value: BigserialValType | string | null): BigserialValType | null;
 }
-/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `number`. */
+/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `bigint`. */
 declare function bigserial<TConfig extends BigserialConfig>(config: TConfig): BigserialColumn<TConfig>;
 //#endregion
 export { bigserial };

package/dist/src/columns/bigserial.mjs

@@ -14,11 +14,11 @@ var BigserialColumn = class extends Column {
 		return null;
 	}
 	get zodTypeScaler() {
-		return z.coerce.number();
+		return z.coerce.bigint();
 	}
 	toDriverScalar(value) {
 		if (value === null) return null;
-		return value instanceof Sql ? value.string : value;
+		return value instanceof Sql ? value.string : value.toString();
 	}
 	toSQLScalar(value) {
 		if (value === null) return "NULL";
@@ -27,10 +27,10 @@ var BigserialColumn = class extends Column {
 	}
 	fromDriverScalar(value) {
 		if (value === null) return null;
-		return typeof value === "string" ? parseInt(value, 10) : value;
+		return BigInt(value);
 	}
 };
-/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `number`. */
+/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `bigint`. */
 function bigserial(config) {
 	return new BigserialColumn(config);
 }

package/dist/src/columns/common.d.mts

@@ -1,3 +1,4 @@
+import { Key } from "../types.mjs";
 import { Sql } from "../sql.mjs";
 import { entityType } from "../symbols.mjs";
 import { Arg } from "../query-builders/pre.mjs";

package/dist/src/columns/postgis/geography/linestring.d.mts

@@ -1,3 +1,4 @@
+import { SelfOrReadonly } from "../../../types.mjs";
 import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
 import * as z from "zod";

package/dist/src/columns/postgis/geography/multilinestring.d.mts

@@ -1,3 +1,4 @@
+import { SelfOrReadonly } from "../../../types.mjs";
 import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
 import * as z from "zod";

package/dist/src/columns/postgis/geography/multipoint.d.mts

@@ -1,3 +1,4 @@
+import { SelfOrReadonly } from "../../../types.mjs";
 import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
 import * as z from "zod";

package/dist/src/columns/postgis/geography/multipolygon.d.mts

@@ -1,3 +1,4 @@
+import { SelfOrReadonly } from "../../../types.mjs";
 import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
 import * as z from "zod";

package/dist/src/columns/postgis/geography/point.d.mts

@@ -1,3 +1,4 @@
+import { SelfOrReadonly } from "../../../types.mjs";
 import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
 import * as z from "zod";

package/dist/src/columns/postgis/geography/polygon.d.mts

@@ -1,3 +1,4 @@
+import { SelfOrReadonly } from "../../../types.mjs";
 import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
 import * as z from "zod";

package/dist/src/constraints/check.d.mts

@@ -1,3 +1,4 @@
+import { Key } from "../types.mjs";
 import { AnyColumn, TableColumn } from "../table.mjs";
 
 //#region src/constraints/check.d.ts
@@ -28,11 +29,21 @@ type CheckExpr = ComparisonExpr | LogicalExpr | FunctionExpr | RawExpr;
 type SnapshotComparisonOp = "=" | "<>" | "<" | ">" | "<=" | ">=" | "IN" | "NOT IN";
 type SnapshotPatternOp = "LIKE" | "SIMILAR TO" | "~";
 type SnapshotLogicalOp = "AND" | "OR";
+/**
+ * A tagged column reference stored in a snapshot expression.
+ * Stores the snake_case column name so it can be quoted correctly in SQL output.
+ */
+interface ExprColumnRef {
+  type: "col";
+  /** Snake_case column name as used in PostgreSQL (e.g. `user_id`). */
+  name: string;
+}
 interface SnapshotComparisonExpr {
   type: "comparison";
-  left: string | SnapshotFunctionExpr;
+  left: ExprColumnRef | SnapshotFunctionExpr;
   op: SnapshotComparisonOp | SnapshotPatternOp;
-  right: unknown;
+  /** Column ref, or a pre-rendered SQL string (incl. `(v1, v2)` for IN lists). */
+  right: ExprColumnRef | string;
 }
 interface SnapshotLogicalExpr {
   type: "logical";
@@ -42,7 +53,8 @@ interface SnapshotLogicalExpr {
 interface SnapshotFunctionExpr {
   type: "function";
   name: string;
-  args: (string | unknown)[];
+  /** Column refs or pre-rendered SQL strings. */
+  args: (ExprColumnRef | string)[];
 }
 interface SnapshotRawExpr {
   type: "raw";
@@ -59,8 +71,8 @@ declare class CheckBuilder {
   like<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, pattern: string): ComparisonExpr;
   similarTo<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, pattern: string): ComparisonExpr;
   regex<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, pattern: string): ComparisonExpr;
-  in<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: (TCol["ValType"] & (string | number))[]): ComparisonExpr;
-  notIn<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: (TCol["ValType"] & (string | number))[]): ComparisonExpr;
+  in<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: TCol["ValType"][]): ComparisonExpr;
+  notIn<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: TCol["ValType"][]): ComparisonExpr;
   and(...expressions: CheckExpr[]): LogicalExpr;
   or(...expressions: CheckExpr[]): LogicalExpr;
   length<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol): FunctionExpr;

package/dist/src/constraints/check.mjs

@@ -218,35 +218,39 @@ var Check = class {
 function check(name, expr) {
 	return new Check(name, expr);
 }
-function formatValue(value) {
+/**
+* Converts a raw JavaScript value to a SQL literal string.
+* Used as a fallback when no column type context is available.
+*/
+function formatUnknown(value) {
 	if (value === null) return "NULL";
+	if (typeof value === "bigint") return value.toString();
 	if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
 	if (typeof value === "number") return String(value);
 	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-	if (value instanceof Date) return `'${value.toISOString()}'`;
 	return String(value);
 }
 function exprToSQL(expr) {
 	if (expr.type === "raw") return expr.sql;
 	if (expr.type === "comparison") {
 		let left;
-		if (isTableCol(expr.left)) left = `"${expr.left.name}"`;
+		if (isTableCol(expr.left)) left = `"${expr.left.nameSnake}"`;
 		else if (expr.left.type === "function") left = exprToSQL(expr.left);
 		else left = String(expr.left);
 		if (expr.op === "IN" || expr.op === "NOT IN") {
 			if (Array.isArray(expr.right)) {
-				const list = expr.right.map((v) => isTableCol(v) ? `"${v.name}"` : formatValue(v)).join(", ");
+				const list = expr.right.map((v) => isTableCol(v) ? `"${v.nameSnake}"` : formatUnknown(v)).join(", ");
 				return `${left} ${expr.op} (${list})`;
 			}
-			const singleRight = isTableCol(expr.right) ? `"${expr.right.name}"` : formatValue(expr.right);
+			const singleRight = isTableCol(expr.right) ? `"${expr.right.nameSnake}"` : formatUnknown(expr.right);
 			return `${left} ${expr.op} (${singleRight})`;
 		}
-		const right = isTableCol(expr.right) ? `"${expr.right.name}"` : formatValue(expr.right);
+		const right = isTableCol(expr.right) ? `"${expr.right.nameSnake}"` : isTableCol(expr.left) ? expr.left.toSQL(expr.right) : formatUnknown(expr.right);
 		return `${left} ${expr.op} ${right}`;
 	}
 	if (expr.type === "logical") return `(${expr.expressions.map((e) => exprToSQL(e)).join(` ${expr.op} `)})`;
 	if (expr.type === "function") {
-		const args = expr.args.map((arg) => isTableCol(arg) ? `"${arg.name}"` : formatValue(arg));
+		const args = expr.args.map((arg) => isTableCol(arg) ? `"${arg.nameSnake}"` : formatUnknown(arg));
 		return `${expr.name}(${args.join(", ")})`;
 	}
 	throw new Error("Unknown expression type");
@@ -258,10 +262,24 @@ function exprToSnapshot(expr) {
 	};
 	if (expr.type === "comparison") {
 		let left;
-		if (isTableCol(expr.left)) left = expr.left.name;
-		else if (expr.left.type === "function") left = exprToSnapshot(expr.left);
-		else left = String(expr.left);
-		const right = isTableCol(expr.right) ? expr.right.name : expr.right;
+		if (isTableCol(expr.left)) left = {
+			type: "col",
+			name: expr.left.nameSnake
+		};
+		else left = exprToSnapshot(expr.left);
+		let right;
+		if (isTableCol(expr.right)) right = {
+			type: "col",
+			name: expr.right.nameSnake
+		};
+		else if ((expr.op === "IN" || expr.op === "NOT IN") && Array.isArray(expr.right)) {
+			const refCol = isTableCol(expr.left) ? expr.left : void 0;
+			right = `(${expr.right.map((v) => {
+				if (isTableCol(v)) return `"${v.nameSnake}"`;
+				return refCol ? refCol.toSQL(v) : formatUnknown(v);
+			}).join(", ")})`;
+		} else if (isTableCol(expr.left)) right = expr.left.toSQL(expr.right);
+		else right = formatUnknown(expr.right);
 		return {
 			type: "comparison",
 			left,
@@ -274,34 +292,40 @@ function exprToSnapshot(expr) {
 		op: expr.op,
 		expressions: expr.expressions.map((e) => exprToSnapshot(e))
 	};
-	if (expr.type === "function") return {
-		type: "function",
-		name: expr.name,
-		args: expr.args.map((arg) => isTableCol(arg) ? arg.name : arg)
-	};
+	if (expr.type === "function") {
+		const refCol = expr.args.find(isTableCol);
+		return {
+			type: "function",
+			name: expr.name,
+			args: expr.args.map((arg) => {
+				if (isTableCol(arg)) return {
+					type: "col",
+					name: arg.nameSnake
+				};
+				return refCol ? refCol.toSQL(arg) : formatUnknown(arg);
+			})
+		};
+	}
 	throw new Error("Unknown expression type");
 }
+/** Type guard for {@link ExprColumnRef}. */
+function isExprColumnRef(value) {
+	return typeof value === "object" && value !== null && value.type === "col";
+}
+/** Convert a snapshot expression back to a SQL string. */
 function snapshotExprToSQL(expr) {
 	if (expr.type === "raw") return expr.sql;
 	if (expr.type === "comparison") {
-		const left = typeof expr.left === "string" ? `"${expr.left}"` : snapshotExprToSQL(expr.left);
-		const right = formatSnapshotValue(expr.right);
+		const left = isExprColumnRef(expr.left) ? `"${expr.left.name}"` : snapshotExprToSQL(expr.left);
+		const right = isExprColumnRef(expr.right) ? `"${expr.right.name}"` : expr.right;
 		return `${left} ${expr.op} ${right}`;
 	}
 	if (expr.type === "logical") return expr.expressions.map((e) => snapshotExprToSQL(e)).map((p) => `(${p})`).join(` ${expr.op} `);
 	if (expr.type === "function") {
-		const args = expr.args.map((a) => typeof a === "string" ? `"${a}"` : formatSnapshotValue(a));
+		const args = expr.args.map((a) => isExprColumnRef(a) ? `"${a.name}"` : a);
 		return `${expr.name}(${args.join(", ")})`;
 	}
 	throw new Error("Unknown expression type");
 }
-function formatSnapshotValue(value) {
-	if (value === null) return "NULL";
-	if (Array.isArray(value)) return `(${value.map((v) => formatSnapshotValue(v)).join(", ")})`;
-	if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
-	if (typeof value === "number") return String(value);
-	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-	return String(value);
-}
 //#endregion
 export { CheckBuilder, check, snapshotExprToSQL };

package/dist/src/constraints/primary-key.d.mts

@@ -1,3 +1,4 @@
+import { Key } from "../types.mjs";
 import { AnyColumn, AnyTableWithColumns, TableColumn } from "../table.mjs";
 
 //#region src/constraints/primary-key.d.ts

package/dist/src/constraints/unique.d.mts

@@ -1,3 +1,4 @@
+import { Key } from "../types.mjs";
 import { AnyColumn, AnyTableWithColumns, TableColumn } from "../table.mjs";
 
 //#region src/constraints/unique.d.ts

package/dist/src/db.d.mts

@@ -60,24 +60,24 @@ declare class Base<TTName extends string, TTables extends Record<TTName, TableWi
    * @param where Optional where clause to filter rows
    * @returns Promise<number> - the count of matching rows
    */
-  $count<TTable extends TTables[keyof TTables]>(table: TTable): CountQuery<TTable>;
-  $count<TTable extends TTables[keyof TTables], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, where: TWhere): CountQuery<TTable>;
+  $count<TTable extends TTables[keyof TTables]>(table: TTable): CountQuery<TTable, TPrepare>;
+  $count<TTable extends TTables[keyof TTables], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, where: TWhere): CountQuery<TTable, TPrepare>;
   /**
    * Check if any rows exist in a table, optionally filtered by a where clause.
    * @param table The table to check
    * @param where Optional where clause to filter rows
    * @returns Promise<boolean> - true if at least one row exists
    */
-  $exists<TTable extends TTables[keyof TTables]>(table: TTable): ExistsQuery<TTable>;
-  $exists<TTable extends TTables[keyof TTables], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, where: TWhere): ExistsQuery<TTable>;
+  $exists<TTable extends TTables[keyof TTables]>(table: TTable): ExistsQuery<TTable, TPrepare>;
+  $exists<TTable extends TTables[keyof TTables], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, where: TWhere): ExistsQuery<TTable, TPrepare>;
   /**
    * Get the first row from a table, optionally filtered by a where clause.
    * @param table The table to query
    * @param where Optional where clause to filter rows
    * @returns Promise<T | null> - the first row or null if no rows match
    */
-  $first<TTable extends TTables[keyof TTables]>(table: TTable): FirstQuery<TTable>;
-  $first<TTable extends TTables[keyof TTables], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, where: TWhere): FirstQuery<TTable>;
+  $first<TTable extends TTables[keyof TTables]>(table: TTable): FirstQuery<TTable, TPrepare>;
+  $first<TTable extends TTables[keyof TTables], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, where: TWhere): FirstQuery<TTable, TPrepare>;
   /**
    * Calculate the sum of a numeric column.
    * @param table The table to query
@@ -85,8 +85,8 @@ declare class Base<TTName extends string, TTables extends Record<TTName, TableWi
    * @param where Optional where clause to filter rows
    * @returns Promise<number | null> - the sum or null if no rows match
    */
-  $sum<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null>;
-  $sum<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null>;
+  $sum<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
+  $sum<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
   /**
    * Calculate the average of a numeric column.
    * @param table The table to query
@@ -94,8 +94,8 @@ declare class Base<TTName extends string, TTables extends Record<TTName, TableWi
    * @param where Optional where clause to filter rows
    * @returns Promise<number | null> - the average or null if no rows match
    */
-  $avg<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null>;
-  $avg<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null>;
+  $avg<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
+  $avg<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
   /**
    * Find the minimum value of a column.
    * @param table The table to query
@@ -103,8 +103,8 @@ declare class Base<TTName extends string, TTables extends Record<TTName, TableWi
    * @param where Optional where clause to filter rows
    * @returns Promise<number | null> - the minimum value or null if no rows match
    */
-  $min<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null>;
-  $min<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null>;
+  $min<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
+  $min<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
   /**
    * Find the maximum value of a column.
    * @param table The table to query
@@ -112,8 +112,8 @@ declare class Base<TTName extends string, TTables extends Record<TTName, TableWi
    * @param where Optional where clause to filter rows
    * @returns Promise<number | null> - the maximum value or null if no rows match
    */
-  $max<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null>;
-  $max<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null>;
+  $max<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
+  $max<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, column: TColumn, where: TWhere): AggregateQuery<TTable, TColumn, number | null, TPrepare>;
   /**
    * Get distinct values of a column.
    * @param table The table to query
@@ -121,8 +121,8 @@ declare class Base<TTName extends string, TTables extends Record<TTName, TableWi
    * @param where Optional where clause to filter rows
    * @returns Promise<T[]> - array of distinct values
    */
-  $distinct<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): DistinctQuery<TTable, TColumn, TColumn["ValTypeSelect"][]>;
-  $distinct<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>>>(table: TTable, column: TColumn, where: TWhere): DistinctQuery<TTable, TColumn, TColumn["ValTypeSelect"][]>;
+  $distinct<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]]>(table: TTable, column: TColumn): DistinctQuery<TTable, TColumn, TColumn["ValTypeSelect"][], TPrepare>;
+  $distinct<TTable extends TTables[keyof TTables], TColumn extends TTable["_"]["columns"][keyof TTable["_"]["columns"]], TWhere extends BuildFilterExpression<TColsToLeftRight<TTable["_"]["columns"]>, TPrepare>>(table: TTable, column: TColumn, where: TWhere): DistinctQuery<TTable, TColumn, TColumn["ValTypeSelect"][], TPrepare>;
   /**
    * Insert a row and return the inserted row with all columns.
    * @param table The table to insert into

package/dist/src/db.mjs

@@ -67,28 +67,28 @@ var Base = class {
 		return new DeleteQuery(table, void 0, void 0, this.#getExecutor(), this.$.pre);
 	}
 	$count(table, where) {
-		return new CountQuery(table, where, this.#getExecutor());
+		return new CountQuery(table, where, this.#getExecutor(), this.$.pre);
 	}
 	$exists(table, where) {
-		return new ExistsQuery(table, where, this.#getExecutor());
+		return new ExistsQuery(table, where, this.#getExecutor(), this.$.pre);
 	}
 	$first(table, where) {
-		return new FirstQuery(table, where, this.#getExecutor());
+		return new FirstQuery(table, where, this.#getExecutor(), this.$.pre);
 	}
 	$sum(table, column, where) {
-		return new AggregateQuery(table, column, "SUM", where, this.#getExecutor());
+		return new AggregateQuery(table, column, "SUM", where, this.#getExecutor(), this.$.pre);
 	}
 	$avg(table, column, where) {
-		return new AggregateQuery(table, column, "AVG", where, this.#getExecutor());
+		return new AggregateQuery(table, column, "AVG", where, this.#getExecutor(), this.$.pre);
 	}
 	$min(table, column, where) {
-		return new AggregateQuery(table, column, "MIN", where, this.#getExecutor());
+		return new AggregateQuery(table, column, "MIN", where, this.#getExecutor(), this.$.pre);
 	}
 	$max(table, column, where) {
-		return new AggregateQuery(table, column, "MAX", where, this.#getExecutor());
+		return new AggregateQuery(table, column, "MAX", where, this.#getExecutor(), this.$.pre);
 	}
 	$distinct(table, column, where) {
-		return new DistinctQuery(table, column, where, this.#getExecutor());
+		return new DistinctQuery(table, column, where, this.#getExecutor(), this.$.pre);
 	}
 	/**
 	* Insert a row and return the inserted row with all columns.

package/dist/src/filters/array.d.mts

@@ -18,7 +18,6 @@ declare class ArrayContainsFilter<TCol extends AnyTC, TVal extends ArrayElement<
   readonly left: TCol;
   readonly right: TVal[];
   constructor(column: TCol, values: TVal[]);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -37,7 +36,6 @@ declare class ArrayContainedByFilter<TCol extends AnyTC, TVal extends ArrayEleme
   readonly left: TCol;
   readonly right: TVal[];
   constructor(column: TCol, values: TVal[]);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -53,7 +51,6 @@ declare class ArrayOverlapsFilter<TCol extends AnyTC, TVal extends ArrayElement<
   readonly left: TCol;
   readonly right: TVal[];
   constructor(column: TCol, values: TVal[]);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -69,7 +66,6 @@ declare class ArrayHasFilter<TCol extends AnyTC, TVal extends ArrayElement<TCol[
   readonly left: TCol;
   readonly right: TVal;
   constructor(column: TCol, value: TVal);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -85,7 +81,6 @@ declare class ArrayAllFilter<TCol extends AnyTC, TVal extends ArrayElement<TCol[
   readonly left: TCol;
   readonly right: TVal;
   constructor(column: TCol, value: TVal);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**