durcno 1.0.0-alpha.3 → 1.0.0-alpha.5

package/README.md

@@ -1,8 +1,6 @@
 <p align="center">
-  <a href="https://npmjs.com/package/durcno" target="_blank">
-    <img src="https://img.shields.io/npm/v/durcno?style=flat&logo=npm&color=339933" alt="npm version" />
-  </a>
-  <img src="https://img.shields.io/badge/Node.js-24%2B-339933?style=flat&logo=node.js&logoColor=white" alt="Node.js 24+" />
+  <img alt="NPM Downloads" src="https://img.shields.io/npm/dw/durcno" alt="Downloads" />
+  <img src="https://img.shields.io/badge/Node.js-24%2B-339935?style=flat&logo=node.js&logoColor=white" alt="Node.js 24+" />
   <img src="https://img.shields.io/badge/PostgreSQL-14%2B-336791?style=flat&logo=postgresql&logoColor=white" alt="PostgreSQL 14+" />
   <img src="https://img.shields.io/badge/License-Apache%202.0-blue?style=flat" alt="License" />
   <img src="https://img.shields.io/badge/vitest--green?logo=vitest" alt="License" />
@@ -31,7 +29,7 @@
 ## Setup
 
 ```bash
-npm install durcno
+npm add durcno@alpha
 ```
 
 ```bash
@@ -42,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

@@ -8961,25 +8961,24 @@ async function runDownMigration(migrationDirName, isFirstMigration, migrationsDi
     const options = migrationModule.options ?? {};
     const useTransaction = options.transaction ?? true;
     const execution = options.execution ?? "joined";
-    if (useTransaction) {
-      await client.query("BEGIN;");
-    }
     try {
       if (statements.length > 0) {
         if (execution === "sequential") {
+          if (useTransaction) await client.query("BEGIN;");
           for (const st of statements) {
             await client.query(st.toSQL());
           }
+          if (useTransaction) await client.query("COMMIT;");
         } else {
-          const sql = `${statements.map((st) => st.toSQL()).join("\n")}`;
+          let sql = "";
+          if (useTransaction) sql += "BEGIN;\n";
+          sql += statements.map((st) => st.toSQL()).join("\n");
+          if (useTransaction) sql += "\nCOMMIT;";
           await client.query(sql);
         }
       }
-      if (useTransaction) {
-        await client.query("COMMIT;");
-      }
     } catch (e) {
-      if (useTransaction) {
+      if (useTransaction && execution === "sequential") {
         await client.query("ROLLBACK;");
       }
       throw e;
@@ -12275,12 +12274,14 @@ async function generate(options) {
     ssCurrent,
     renamedTables
   );
+  const connectorMigrationOpts = config2.connector.constructor.migrationOptions;
   const migrationUpTs = generateMigration(
     ssPrevious,
     ssCurrent,
     "up",
     renamedTables,
-    renamedColumns
+    renamedColumns,
+    connectorMigrationOpts
   );
   const reverseRenamedTables = {};
   for (const [oldKey, newKey] of Object.entries(renamedTables)) {
@@ -12299,7 +12300,8 @@ async function generate(options) {
     ssPrevious,
     "down",
     reverseRenamedTables,
-    reverseRenamedColumns
+    reverseRenamedColumns,
+    connectorMigrationOpts
   );
   if (migrationUpTs === null) {
     console.log(yellow3("No changes detected. Skipping migration creation."));
@@ -12311,14 +12313,14 @@ async function generate(options) {
   (0, import_node_fs2.writeFileSync)((0, import_node_path4.resolve)(migrationDir, "up.ts"), migrationUpTs);
   (0, import_node_fs2.writeFileSync)(
     (0, import_node_path4.resolve)(migrationDir, "down.ts"),
-    migrationDnTs ?? generateNoOpMigration()
+    migrationDnTs ?? generateNoOpMigration(connectorMigrationOpts)
   );
   const migrationsRelativePath = (0, import_node_path4.relative)(process.cwd(), migrationsDir);
   console.log(
     `${bgGreen2.white.bold("[CREATED]")} ${cyan3(migrationName)} at ${cyan3(`${migrationsRelativePath}/`)}`
   );
 }
-function generateMigration(prev, curr, direction, renamedTables = {}, renamedColumns = {}) {
+function generateMigration(prev, curr, direction, renamedTables = {}, renamedColumns = {}, defaultOptions) {
   const statements = [];
   const renamedFromKeys = new Set(Object.keys(renamedTables));
   const renamedToKeys = new Set(Object.values(renamedTables));
@@ -12351,7 +12353,7 @@ function generateMigration(prev, curr, direction, renamedTables = {}, renamedCol
   for (const enumName in prev.enums) {
     if (!(enumName in curr.enums)) {
       const enm = prev.enums[enumName];
-      statements.push(`ddl.dropEnum("${enm.schema}", "${enm.name}")`);
+      statements.push(`ddl.dropType("${enm.schema}", "${enm.name}")`);
     }
   }
   for (const enumName in curr.enums) {
@@ -12359,7 +12361,7 @@ function generateMigration(prev, curr, direction, renamedTables = {}, renamedCol
       const enm = curr.enums[enumName];
       const values = enm.values.map((v) => `"${v}"`).join(", ");
       statements.push(
-        `ddl.createEnum("${enm.schema}", "${enm.name}", [${values}])`
+        `ddl.createType("${enm.schema}", "${enm.name}", { asEnum: [${values}] })`
       );
     } else {
       const prevValues = prev.enums[enumName].values;
@@ -12417,15 +12419,15 @@ function generateMigration(prev, curr, direction, renamedTables = {}, renamedCol
             }
             if (afterValue !== null) {
               statements.push(
-                `ddl.alterEnumAddValue("${enm.schema}", "${enm.name}", "${addedValue}", { after: "${afterValue}" })`
+                `ddl.alterType("${enm.schema}", "${enm.name}").addValue("${addedValue}", { after: "${afterValue}" })`
               );
             } else if (beforeValue !== null) {
               statements.push(
-                `ddl.alterEnumAddValue("${enm.schema}", "${enm.name}", "${addedValue}", { before: "${beforeValue}" })`
+                `ddl.alterType("${enm.schema}", "${enm.name}").addValue("${addedValue}", { before: "${beforeValue}" })`
               );
             } else {
               statements.push(
-                `ddl.alterEnumAddValue("${enm.schema}", "${enm.name}", "${addedValue}")`
+                `ddl.alterType("${enm.schema}", "${enm.name}").addValue("${addedValue}")`
               );
             }
           }
@@ -12524,25 +12526,25 @@ function generateMigration(prev, curr, direction, renamedTables = {}, renamedCol
   if (statements.length === 0) return null;
   return `import { type DDLStatement, ddl, type MigrationOptions } from "durcno/migration";
 
-export const options: MigrationOptions = {
-  transaction: true,
-};
+export const options: MigrationOptions = ${stringifyMigrationOpts(defaultOptions ?? { transaction: true })};
 
 export const statements: DDLStatement[] = [
   ${statements.join(",\n  ")},
 ];
 `;
 }
-function generateNoOpMigration() {
+function generateNoOpMigration(defaultOptions) {
   return `import { type DDLStatement, ddl, type MigrationOptions } from "durcno/migration";
 
-export const options: MigrationOptions = {
-  transaction: true,
-};
+export const options: MigrationOptions = ${stringifyMigrationOpts(defaultOptions ?? { transaction: true })};
 
 export const statements: DDLStatement[] = [];
 `;
 }
+function stringifyMigrationOpts(opts) {
+  if (opts.transaction === void 0) opts.transaction = true;
+  return JSON.stringify(opts, null, 2);
+}
 function generateAlterTableStmts(prevTable, currTable, tableName, curr, statements, columnRenames) {
   const alterStatements = [];
   const renamedFromCols = new Set(
@@ -13060,23 +13062,22 @@ async function runUpMigration(migrationDirName, migrationsDir, client, config2)
   const options = migrationModule.options ?? {};
   const useTransaction = options.transaction ?? true;
   const execution = options.execution ?? "joined";
-  if (useTransaction) {
-    await client.query("BEGIN;");
-  }
   try {
     if (statements.length > 0) {
       if (execution === "sequential") {
+        if (useTransaction) await client.query("BEGIN;");
         for (const st of statements) {
           await client.query(st.toSQL());
         }
+        if (useTransaction) await client.query("COMMIT;");
       } else {
-        const sql = `${statements.map((st) => st.toSQL()).join("\n")}`;
+        let sql = "";
+        if (useTransaction) sql += "BEGIN;\n";
+        sql += statements.map((st) => st.toSQL()).join("\n");
+        if (useTransaction) sql += "\nCOMMIT;";
         await client.query(sql);
       }
     }
-    if (useTransaction) {
-      await client.query("COMMIT;");
-    }
     console.log(
       bgGreen3.white.bold("[APPLIED]") + " " + green2(`Migration ${cyan5(migrationDirName)}`) + dim3(".")
     );
@@ -13089,7 +13090,7 @@ async function runUpMigration(migrationDirName, migrationsDir, client, config2)
     });
     await db.close();
   } catch (e) {
-    if (useTransaction) {
+    if (useTransaction && execution === "sequential") {
       await client.query("ROLLBACK;");
     }
     throw e;
@@ -13472,6 +13473,8 @@ async function status(options) {
     console.log(source_default.yellow("No migrations found."));
     process.exit(0);
   }
+  connector.pool = { ...connector.pool, max: 1 };
+  connector.logger = void 0;
   const db = (0, import_durcno4.database)({ Migrations: import_durcno4.Migrations }, config2);
   const migrationsQuery = db.from(import_durcno4.Migrations).select();
   let migrations;
@@ -13505,7 +13508,7 @@ async function status(options) {
 }
 
 // src/cli/index.ts
-program.version("1.0.0-alpha.2");
+program.version("1.0.0-alpha.4");
 var Options = {
   config: ["--config <path>", "Path to the config file"]
 };

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

@@ -1,7 +1,8 @@
+import { Key } from "../types.mjs";
 import { Sql } from "../sql.mjs";
 import { entityType } from "../symbols.mjs";
-import { StdTableColumn, TableColumn } from "../table.mjs";
 import { Arg } from "../query-builders/pre.mjs";
+import { StdTableColumn, TableColumn } from "../table.mjs";
 import * as z from "zod";
 
 //#region src/columns/common.d.ts

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

@@ -1,6 +1,6 @@
 import { Sql } from "../sql.mjs";
-import { Column, ColumnConfig } from "./common.mjs";
 import { Enum } from "../enumtype.mjs";
+import { Column, ColumnConfig } from "./common.mjs";
 import * as z from "zod";
 
 //#region src/columns/enum.d.ts

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/connectors/common.d.mts

@@ -1,5 +1,6 @@
 import { DurcnoLogger } from "../logger.mjs";
 import { Query } from "../query-builders/query.mjs";
+import { MigrationOptions } from "../migration/index.mjs";
 import { ConnectionOptions } from "node:tls";
 
 //#region src/connectors/common.d.ts
@@ -55,6 +56,23 @@ type ConnectorOptions = {
  * @abstract
  */
 declare abstract class Connector {
+  /**
+   * Default migration options applied to generated migration files for this
+   * connector. When set, the `generate` CLI command will use these values as
+   * the `options` export in the produced `up.ts` / `down.ts` files instead of
+   * the built-in defaults.
+   *
+   * @example
+   * ```typescript
+   * class MyConnector extends Connector {
+   *   static override migrationOptions: MigrationOptions = {
+   *     transaction: false,
+   *     execution: "sequential",
+   *   };
+   * }
+   * ```
+   */
+  static migrationOptions?: MigrationOptions;
   /**
    * The original options passed to the connector constructor.
    * Provides full access to `dbCredentials`, `pool`, and `logger`.
@@ -207,4 +225,4 @@ declare abstract class $Pool extends $QueryExecutor {
  */
 type QueryExecutor = $Client | $Pool;
 //#endregion
-export { $Pool, Connector, ConnectorOptions, QueryExecutor };
+export { $Client, $Pool, Connector, ConnectorOptions, QueryExecutor };

package/dist/src/connectors/common.mjs

@@ -30,6 +30,23 @@ function getUrlFromDbCredentials(dbCredentials) {
 * @abstract
 */
 var Connector = class {
+	/**
+	* Default migration options applied to generated migration files for this
+	* connector. When set, the `generate` CLI command will use these values as
+	* the `options` export in the produced `up.ts` / `down.ts` files instead of
+	* the built-in defaults.
+	*
+	* @example
+	* ```typescript
+	* class MyConnector extends Connector {
+	*   static override migrationOptions: MigrationOptions = {
+	*     transaction: false,
+	*     execution: "sequential",
+	*   };
+	* }
+	* ```
+	*/
+	static migrationOptions;
 	/**
 	* The original options passed to the connector constructor.
 	* Provides full access to `dbCredentials`, `pool`, and `logger`.

package/dist/src/connectors/pglite.d.mts

@@ -14,6 +14,14 @@ import { PGliteOptions } from "@electric-sql/pglite";
  */
 declare class PgLiteConnector extends Connector {
   #private;
+  /**
+   * PGlite does not support DDL statements inside transactions and requires
+   * sequential execution, so migrations are generated with these defaults.
+   */
+  static migrationOptions: {
+    transaction: boolean;
+    execution: "sequential";
+  };
   constructor(options: ConnectorOptions, driverOptions?: PGliteOptions);
   getClient(): PgLiteClient;
   getPool(): PgLitePool;

package/dist/src/connectors/pglite.mjs

@@ -12,6 +12,14 @@ import { PGlite } from "@electric-sql/pglite";
 * @see https://www.npmjs.com/package/@electric-sql/pglite
 */
 var PgLiteConnector = class extends Connector {
+	/**
+	* PGlite does not support DDL statements inside transactions and requires
+	* sequential execution, so migrations are generated with these defaults.
+	*/
+	static migrationOptions = {
+		transaction: false,
+		execution: "sequential"
+	};
 	#driverOptions;
 	constructor(options, driverOptions) {
 		super(options);

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

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

@@ -1,4 +1,3 @@
-import { AnyColumn, AnyRelations, IsTableWC, Relations, TColsToLeftRight, TableWCorNever, TableWithColumns } from "./table.mjs";
 import { SelectBuilder } from "./query-builders/select.mjs";
 import { BuildFilterExpression } from "./filters/index.mjs";
 import { Config } from "./index.mjs";
@@ -13,6 +12,7 @@ import { InsertReturningQuery } from "./query-builders/insert-returning.mjs";
 import { RawQuery } from "./query-builders/raw.mjs";
 import { RelationQueryBuilder } from "./query-builders/rq.mjs";
 import { UpdateBuilder } from "./query-builders/update.mjs";
+import { AnyColumn, AnyRelations, IsTableWC, Relations, TColsToLeftRight, TableWCorNever, TableWithColumns } from "./table.mjs";
 import { $Pool, QueryExecutor } from "./connectors/common.mjs";
 
 //#region src/db.d.ts
@@ -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

@@ -1,6 +1,6 @@
-import { AnyColumn, TableColumn } from "../table.mjs";
-import { Filter } from "./custom.mjs";
 import { Query } from "../query-builders/query.mjs";
+import { Filter } from "./custom.mjs";
+import { AnyColumn, TableColumn } from "../table.mjs";
 
 //#region src/filters/array.d.ts
 /** Shorthand for the Filter's TableColumn constraint. */

package/dist/src/filters/array.mjs

@@ -1,18 +1,5 @@
 import { Filter } from "./custom.mjs";
 //#region src/filters/array.ts
-/** Converts an array of values to a PostgreSQL array literal. */
-function arrayToSql(values) {
-	if (values.length === 0) return "'{}'";
-	return `ARRAY[${values.map((v) => {
-		if (typeof v === "string") return `'${v.replace(/'/g, "''")}'`;
-		return String(v);
-	}).join(", ")}]`;
-}
-/** Converts a single value to a SQL literal. */
-function valueToSql(value) {
-	if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
-	return String(value);
-}
 /**
 * ArrayContains filter: col @> ARRAY[values]
 * Returns true if the array column contains all the specified values.
@@ -26,10 +13,10 @@ var ArrayContainsFilter = class extends Filter {
 		this.right = values;
 	}
 	toSQL() {
-		return `${this.left.fullName} @> ${arrayToSql(this.right)}`;
+		return `${this.left.fullName} @> ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
 	toQuery(query) {
-		query.sql += `${this.left.fullName} @> ${arrayToSql(this.right)}`;
+		query.sql += `${this.left.fullName} @> ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
 };
 /**
@@ -55,10 +42,10 @@ var ArrayContainedByFilter = class extends Filter {
 		this.right = values;
 	}
 	toSQL() {
-		return `${this.left.fullName} <@ ${arrayToSql(this.right)}`;
+		return `${this.left.fullName} <@ ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
 	toQuery(query) {
-		query.sql += `${this.left.fullName} <@ ${arrayToSql(this.right)}`;
+		query.sql += `${this.left.fullName} <@ ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
 };
 /**
@@ -81,10 +68,10 @@ var ArrayOverlapsFilter = class extends Filter {
 		this.right = values;
 	}
 	toSQL() {
-		return `${this.left.fullName} && ${arrayToSql(this.right)}`;
+		return `${this.left.fullName} && ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
 	toQuery(query) {
-		query.sql += `${this.left.fullName} && ${arrayToSql(this.right)}`;
+		query.sql += `${this.left.fullName} && ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
 };
 /**
@@ -107,10 +94,10 @@ var ArrayHasFilter = class extends Filter {
 		this.right = value;
 	}
 	toSQL() {
-		return `${valueToSql(this.right)} = ANY(${this.left.fullName})`;
+		return `${this.left.toSQLScalar(this.right)} = ANY(${this.left.fullName})`;
 	}
 	toQuery(query) {
-		query.sql += `${valueToSql(this.right)} = ANY(${this.left.fullName})`;
+		query.sql += `${this.left.toSQLScalar(this.right)} = ANY(${this.left.fullName})`;
 	}
 };
 /**
@@ -133,10 +120,10 @@ var ArrayAllFilter = class extends Filter {
 		this.right = value;
 	}
 	toSQL() {
-		return `${valueToSql(this.right)} = ALL(${this.left.fullName})`;
+		return `${this.left.toSQLScalar(this.right)} = ALL(${this.left.fullName})`;
 	}
 	toQuery(query) {
-		query.sql += `${valueToSql(this.right)} = ALL(${this.left.fullName})`;
+		query.sql += `${this.left.toSQLScalar(this.right)} = ALL(${this.left.fullName})`;
 	}
 };
 /**

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

@@ -1,5 +1,5 @@
-import { AnyColumn, TableColumn } from "../table.mjs";
 import { Query } from "../query-builders/query.mjs";
+import { AnyColumn, TableColumn } from "../table.mjs";
 
 //#region src/filters/custom.d.ts
 /** Abstract base class for SQL filter expressions used in `WHERE`/`ON` clauses. */