durcno 1.0.0-alpha.4 → 1.0.0-alpha.5

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

@@ -13508,7 +13508,7 @@ async function status(options) {
 }
 
 // src/cli/index.ts
-program.version("1.0.0-alpha.3");
+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,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

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

@@ -1,4 +1,5 @@
 import { Query } from "../query-builders/query.mjs";
+import { Key } from "../types.mjs";
 import { SelectQuery } from "../query-builders/select.mjs";
 import { Sql } from "../sql.mjs";
 import { Filter } from "./custom.mjs";

package/dist/src/index.d.mts

@@ -1,5 +1,6 @@
 import { DurcnoLogger } from "./logger.mjs";
 import { Query } from "./query-builders/query.mjs";
+import { Is, Key, Prettify, SelfOrArray, SelfOrReadonly, UnionToIntersection, Valueof } from "./types.mjs";
 import { asc, desc } from "./query-builders/orderby-clause.mjs";
 import { Sql, sql } from "./sql.mjs";
 import { Filter } from "./filters/custom.mjs";
@@ -91,14 +92,5 @@ type Config<T extends Connector = Connector> = {
    */
   connector: T;
 };
-declare global {
-  type Key = string | number | symbol;
-  type Valueof<T> = T extends any ? T[keyof T] : never;
-  type SelfOrArray<T> = T | T[];
-  type SelfOrReadonly<T> = T | Readonly<T>;
-  type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
-  type Is<T, U> = T extends U ? true : false;
-  type Prettify<T> = { [K in keyof T]: T[K] } & {};
-}
 //#endregion
-export { $, type $Client, type AnyColumn, type AnyTableColumn, Arg, Column, type ColumnConfig, Config, type ConnectorOptions, type DurcnoLogger, Filter, Migrations, PrimaryKeyConstraint, Query, Sql, type TableColumn, UniqueConstraint, type UuidVersion, and, arrayAll, arrayContainedBy, arrayContains, arrayHas, arrayOverlaps, asc, bigint, bigserial, boolean, bytea, char, cidr, database, date, defineConfig, desc, enumed, enumtype, eq, fk, geography, gt, gte, index, inet, integer, isIn, isNotNull, isNull, json, jsonb, lt, lte, macaddr, many, ne, notNull, now, numeric, one, or, pk, prequery, primaryKey, primaryKeyConstraint, relations, sequence, serial, smallint, smallserial, sql, table, text, time, timestamp, unique, uniqueConstraint, uniqueIndex, uuid, uuidv4, uuidv7, varchar };
+export { $, type $Client, type AnyColumn, type AnyTableColumn, Arg, Column, type ColumnConfig, Config, type ConnectorOptions, type DurcnoLogger, Filter, type Is, type Key, Migrations, type Prettify, PrimaryKeyConstraint, Query, type SelfOrArray, type SelfOrReadonly, Sql, type TableColumn, type UnionToIntersection, UniqueConstraint, type UuidVersion, type Valueof, and, arrayAll, arrayContainedBy, arrayContains, arrayHas, arrayOverlaps, asc, bigint, bigserial, boolean, bytea, char, cidr, database, date, defineConfig, desc, enumed, enumtype, eq, fk, geography, gt, gte, index, inet, integer, isIn, isNotNull, isNull, json, jsonb, lt, lte, macaddr, many, ne, notNull, now, numeric, one, or, pk, prequery, primaryKey, primaryKeyConstraint, relations, sequence, serial, smallint, smallserial, sql, table, text, time, timestamp, unique, uniqueConstraint, uniqueIndex, uuid, uuidv4, uuidv7, varchar };

package/dist/src/indexes.d.mts

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

package/dist/src/logger.d.mts

@@ -15,7 +15,7 @@ interface DurcnoLogger {
  *
  * @example
  * ```ts
- * import { createDurcnoLogger } from "durcno/logger";
+ * import { createQueryLogger } from "durcno/logger";
  * import { defineConfig } from "durcno";
  * import { pg } from "durcno/connectors/pg";
  *
@@ -23,10 +23,14 @@ interface DurcnoLogger {
  *   schema: "db/schema.ts",
  *   out: "migrations",
  *   dbCredentials: { url: process.env.DATABASE_URL! },
- *   logger: createDurcnoLogger(),
+ *   logger: createQueryLogger(),
  * });
  * ```
  */
-declare function createDurcnoLogger(): DurcnoLogger;
+declare function createQueryLogger(): DurcnoLogger;
+/**
+ * @deprecated Use `createQueryLogger` instead.
+ */
+declare const createDurcnoLogger: typeof createQueryLogger;
 //#endregion
-export { DurcnoLogger, createDurcnoLogger };
+export { DurcnoLogger, createDurcnoLogger, createQueryLogger };

package/dist/src/logger.mjs

@@ -35,7 +35,7 @@ const durcnoFormat = printf(({ level, message, label, timestamp, sql, arguments:
 *
 * @example
 * ```ts
-* import { createDurcnoLogger } from "durcno/logger";
+* import { createQueryLogger } from "durcno/logger";
 * import { defineConfig } from "durcno";
 * import { pg } from "durcno/connectors/pg";
 *
@@ -43,15 +43,19 @@ const durcnoFormat = printf(({ level, message, label, timestamp, sql, arguments:
 *   schema: "db/schema.ts",
 *   out: "migrations",
 *   dbCredentials: { url: process.env.DATABASE_URL! },
-*   logger: createDurcnoLogger(),
+*   logger: createQueryLogger(),
 * });
 * ```
 */
-function createDurcnoLogger() {
+function createQueryLogger() {
 	return createLogger({
 		format: combine(label({ label: "durcno" }), timestamp(), durcnoFormat),
 		transports: [new transports.Console()]
 	});
 }
+/**
+* @deprecated Use `createQueryLogger` instead.
+*/
+const createDurcnoLogger = createQueryLogger;
 //#endregion
-export { createDurcnoLogger };
+export { createDurcnoLogger, createQueryLogger };

package/dist/src/query-builders/aggregates.d.mts

@@ -1,4 +1,5 @@
 import { Query } from "./query.mjs";
+import { Key } from "../types.mjs";
 import { QueryPromise } from "./query-promise.mjs";
 import { BuildFilterExpression } from "../filters/index.mjs";
 import { AnyColumn, TColsToLeftRight, TableColumn, TableWithColumns } from "../table.mjs";
@@ -6,9 +7,9 @@ import { QueryExecutor } from "../connectors/common.mjs";
 
 //#region src/query-builders/aggregates.d.ts
 type AggregateFunction = "SUM" | "AVG" | "MIN" | "MAX";
-declare class AggregateQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TColumn extends TableColumn<string, string, Key, AnyColumn>, TReturn extends number | null> extends QueryPromise<TReturn> {
+declare class AggregateQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TColumn extends TableColumn<string, string, Key, AnyColumn>, TReturn extends number | null, TPrepare extends boolean = false> extends QueryPromise<TReturn> {
   #private;
-  constructor(table: TTableWC, column: TColumn, fn: AggregateFunction, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>> | undefined, executor: QueryExecutor);
+  constructor(table: TTableWC, column: TColumn, fn: AggregateFunction, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>, TPrepare> | undefined, executor: QueryExecutor, prepare?: TPrepare);
   toQuery(): Query<TReturn>;
   execute(): Promise<TReturn>;
   handleRows(rows: {

package/dist/src/query-builders/aggregates.mjs

@@ -7,13 +7,15 @@ var AggregateQuery = class extends QueryPromise {
 	#$fn;
 	#$where;
 	#$executor;
-	constructor(table, column, fn, where, executor) {
+	#$prepare;
+	constructor(table, column, fn, where, executor, prepare = false) {
 		super();
 		this.#$table = table;
 		this.#$column = column;
 		this.#$fn = fn;
 		this.#$where = where;
 		this.#$executor = executor;
+		this.#$prepare = prepare;
 	}
 	toQuery() {
 		const columnName = this.#$column.fullName;
@@ -21,7 +23,8 @@ var AggregateQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			query.sql += this.#$where.toSQL();
+			if (this.#$prepare) this.#$where.toQuery(query);
+			else query.sql += this.#$where.toSQL();
 		}
 		return query;
 	}

package/dist/src/query-builders/count.d.mts

@@ -5,9 +5,9 @@ import { AnyColumn, TColsToLeftRight, TableWithColumns } from "../table.mjs";
 import { QueryExecutor } from "../connectors/common.mjs";
 
 //#region src/query-builders/count.d.ts
-declare class CountQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>> extends QueryPromise<number> {
+declare class CountQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TPrepare extends boolean = false> extends QueryPromise<number> {
   #private;
-  constructor(table: TTableWC, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>> | undefined, executor: QueryExecutor);
+  constructor(table: TTableWC, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>, TPrepare> | undefined, executor: QueryExecutor, prepare?: TPrepare);
   toQuery(): Query<number>;
   execute(): Promise<number>;
   handleRows(rows: {

package/dist/src/query-builders/count.mjs

@@ -5,18 +5,21 @@ var CountQuery = class extends QueryPromise {
 	#$table;
 	#$where;
 	#$executor;
-	constructor(table, where, executor) {
+	#$prepare;
+	constructor(table, where, executor, prepare = false) {
 		super();
 		this.#$table = table;
 		this.#$where = where;
 		this.#$executor = executor;
+		this.#$prepare = prepare;
 	}
 	toQuery() {
 		const query = new Query("SELECT count(*) FROM ", this.handleRows.bind(this));
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			query.sql += this.#$where.toSQL();
+			if (this.#$prepare) this.#$where.toQuery(query);
+			else query.sql += this.#$where.toSQL();
 		}
 		return query;
 	}

package/dist/src/query-builders/delete.d.mts

@@ -1,4 +1,5 @@
 import { Query } from "./query.mjs";
+import { Key } from "../types.mjs";
 import { QueryPromise } from "./query-promise.mjs";
 import { BuildFilterExpression } from "../filters/index.mjs";
 import { AnyColumn, TColsToLeftRight, TableWithColumns } from "../table.mjs";

package/dist/src/query-builders/distinct.d.mts

@@ -1,13 +1,14 @@
 import { Query } from "./query.mjs";
+import { Key } from "../types.mjs";
 import { QueryPromise } from "./query-promise.mjs";
 import { BuildFilterExpression } from "../filters/index.mjs";
 import { AnyColumn, TColsToLeftRight, TableColumn, TableWithColumns } from "../table.mjs";
 import { QueryExecutor } from "../connectors/common.mjs";
 
 //#region src/query-builders/distinct.d.ts
-declare class DistinctQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TColumn extends TableColumn<string, string, Key, AnyColumn>, TReturn = TColumn["ValTypeSelect"][]> extends QueryPromise<TReturn> {
+declare class DistinctQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TColumn extends TableColumn<string, string, Key, AnyColumn>, TReturn = TColumn["ValTypeSelect"][], TPrepare extends boolean = false> extends QueryPromise<TReturn> {
   #private;
-  constructor(table: TTableWC, column: TColumn, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>> | undefined, executor: QueryExecutor);
+  constructor(table: TTableWC, column: TColumn, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>, TPrepare> | undefined, executor: QueryExecutor, prepare?: TPrepare);
   toQuery(): Query<TReturn>;
   execute(): Promise<TReturn>;
   handleRows(rows: {

package/dist/src/query-builders/distinct.mjs

@@ -6,12 +6,14 @@ var DistinctQuery = class extends QueryPromise {
 	#$column;
 	#$where;
 	#$executor;
-	constructor(table, column, where, executor) {
+	#$prepare;
+	constructor(table, column, where, executor, prepare = false) {
 		super();
 		this.#$table = table;
 		this.#$column = column;
 		this.#$where = where;
 		this.#$executor = executor;
+		this.#$prepare = prepare;
 	}
 	toQuery() {
 		const columnName = this.#$column.fullName;
@@ -19,7 +21,8 @@ var DistinctQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			query.sql += this.#$where.toSQL();
+			if (this.#$prepare) this.#$where.toQuery(query);
+			else query.sql += this.#$where.toSQL();
 		}
 		query.sql += ` ORDER BY ${columnName}`;
 		return query;

package/dist/src/query-builders/exists.d.mts

@@ -5,9 +5,9 @@ import { AnyColumn, TColsToLeftRight, TableWithColumns } from "../table.mjs";
 import { QueryExecutor } from "../connectors/common.mjs";
 
 //#region src/query-builders/exists.d.ts
-declare class ExistsQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>> extends QueryPromise<boolean> {
+declare class ExistsQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TPrepare extends boolean = false> extends QueryPromise<boolean> {
   #private;
-  constructor(table: TTableWC, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>> | undefined, executor: QueryExecutor);
+  constructor(table: TTableWC, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>, TPrepare> | undefined, executor: QueryExecutor, prepare?: TPrepare);
   toQuery(): Query<boolean>;
   execute(): Promise<boolean>;
   handleRows(rows: {

package/dist/src/query-builders/exists.mjs

@@ -5,18 +5,21 @@ var ExistsQuery = class extends QueryPromise {
 	#$table;
 	#$where;
 	#$executor;
-	constructor(table, where, executor) {
+	#$prepare;
+	constructor(table, where, executor, prepare = false) {
 		super();
 		this.#$table = table;
 		this.#$where = where;
 		this.#$executor = executor;
+		this.#$prepare = prepare;
 	}
 	toQuery() {
 		const query = new Query("SELECT EXISTS(SELECT 1 FROM ", this.handleRows.bind(this));
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			query.sql += this.#$where.toSQL();
+			if (this.#$prepare) this.#$where.toQuery(query);
+			else query.sql += this.#$where.toSQL();
 		}
 		query.sql += ")";
 		return query;

package/dist/src/query-builders/first.d.mts

@@ -5,9 +5,9 @@ import { AnyColumn, TColsToLeftRight, TableWithColumns } from "../table.mjs";
 import { QueryExecutor } from "../connectors/common.mjs";
 
 //#region src/query-builders/first.d.ts
-declare class FirstQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TReturn = { [ColName in keyof TTableWC["_"]["columns"]]: TTableWC["_"]["columns"][ColName]["ValTypeSelect"] } | null> extends QueryPromise<TReturn> {
+declare class FirstQuery<TTableWC extends TableWithColumns<string, string, Record<string, AnyColumn>>, TPrepare extends boolean = false, TReturn = { [ColName in keyof TTableWC["_"]["columns"]]: TTableWC["_"]["columns"][ColName]["ValTypeSelect"] } | null> extends QueryPromise<TReturn> {
   #private;
-  constructor(table: TTableWC, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>> | undefined, executor: QueryExecutor);
+  constructor(table: TTableWC, where: BuildFilterExpression<TColsToLeftRight<TTableWC["_"]["columns"]>, TPrepare> | undefined, executor: QueryExecutor, prepare?: TPrepare);
   toQuery(): Query<TReturn>;
   execute(): Promise<TReturn>;
   handleRows(rows: Record<string, unknown>[]): TReturn;

package/dist/src/query-builders/first.mjs

@@ -6,18 +6,21 @@ var FirstQuery = class extends QueryPromise {
 	#$table;
 	#$where;
 	#$executor;
-	constructor(table, where, executor) {
+	#$prepare;
+	constructor(table, where, executor, prepare = false) {
 		super();
 		this.#$table = table;
 		this.#$where = where;
 		this.#$executor = executor;
+		this.#$prepare = prepare;
 	}
 	toQuery() {
 		const query = new Query("SELECT * FROM ", this.handleRows.bind(this));
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			query.sql += this.#$where.toSQL();
+			if (this.#$prepare) this.#$where.toQuery(query);
+			else query.sql += this.#$where.toSQL();
 		}
 		query.sql += " LIMIT 1";
 		return query;

package/dist/src/query-builders/insert.d.mts

@@ -1,4 +1,5 @@
 import { Query } from "./query.mjs";
+import { Key } from "../types.mjs";
 import { QueryPromise } from "./query-promise.mjs";
 import { AnyColumn, TableWithColumns } from "../table.mjs";
 import { QueryExecutor } from "../connectors/common.mjs";

package/dist/src/query-builders/insert.mjs

@@ -38,38 +38,28 @@ var InsertQuery = class InsertQuery extends QueryPromise {
 		const query = new Query("INSERT INTO ", this.handleRows.bind(this));
 		query.sql += this.#table._.fullName;
 		const valuesArray = Array.isArray(this.#$values) ? this.#$values : [this.#$values];
-		const allFields = /* @__PURE__ */ new Set();
-		for (const row of valuesArray) for (const field of Object.keys(row)) allFields.add(field);
-		for (const col in this.#table._.columns) {
-			const column = this.#table._.columns[col];
-			if (!allFields.has(col) && column.hasInsertFn) allFields.add(column.name);
-		}
-		const fields = Array.from(allFields);
+		const fields = Object.keys(this.#table._.columns);
 		query.sql += " ( ";
 		query.sql += fields.map((field) => `"${this.#table._.columns[field].nameSnake}"`).join(", ");
 		query.sql += " ) VALUES";
-		const rowsValue = [];
-		for (let rowIndex = 0; rowIndex < valuesArray.length; rowIndex++) {
-			const row = valuesArray[rowIndex];
-			const rowValues = [];
-			for (const field of fields) {
-				let value = row[field];
-				const column = this.#table._.columns[field];
-				if (value === void 0) if (column?.hasInsertFn) value = column.getInsertFnVal();
-				else {
-					rowValues.push("NULL");
-					continue;
-				}
-				if (this.#prepare && is(value, Arg)) {
-					const cast = value.cast ?? column?.sqlCast ?? null;
+		valuesArray.forEach((row, i) => {
+			query.sql += "(";
+			fields.forEach((fieldName, j) => {
+				const value = row[fieldName];
+				const column = this.#table._.columns[fieldName];
+				if (value === void 0) if (column.hasInsertFn) query.sql += column.toSQL(column.getInsertFnVal(), { cast: true });
+				else query.sql += "DEFAULT";
+				else if (this.#prepare && is(value, Arg)) {
+					const cast = value.cast ?? column.sqlCast ?? null;
 					const castSuffix = cast ? `::${cast}` : "";
-					rowValues.push(`$${value.index}${castSuffix}`);
+					query.sql += `$${value.index}${castSuffix}`;
 					query.arguments.push(value.key);
-				} else rowValues.push(column?.toSQL(value, { cast: true }));
-			}
-			rowsValue.push(`(${rowValues.join(", ")})`);
-		}
-		query.sql += rowsValue.join(",\n  ");
+				} else query.sql += column.toSQL(value, { cast: true });
+				if (j !== fields.length - 1) query.sql += ", ";
+			});
+			query.sql += ")";
+			if (i !== valuesArray.length - 1) query.sql += ",\n";
+		});
 		if (this.#$returning) {
 			query.sql += " RETURNING ";
 			const returningFields = Object.keys(this.#$returning).filter((k) => this.#$returning?.[k] === true);

package/dist/src/query-builders/orderby-clause.d.mts

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

package/dist/src/query-builders/select.d.mts

@@ -1,4 +1,5 @@
 import { Query } from "./query.mjs";
+import { Key, Prettify, SelfOrArray, UnionToIntersection, Valueof } from "../types.mjs";
 import { OrderBy } from "./orderby-clause.mjs";
 import { QueryPromise } from "./query-promise.mjs";
 import { BuildFilterExpression, StdCondition } from "../filters/index.mjs";

package/dist/src/query-builders/update.d.mts

@@ -1,4 +1,5 @@
 import { Query } from "./query.mjs";
+import { Key } from "../types.mjs";
 import { QueryPromise } from "./query-promise.mjs";
 import { BuildFilterExpression } from "../filters/index.mjs";
 import { AnyColumn, TColsToLeftRight, TableWithColumns } from "../table.mjs";

package/dist/src/table.d.mts

@@ -1,9 +1,9 @@
+import { CamelToSnake, Key } from "./types.mjs";
 import { entityType } from "./symbols.mjs";
 import { PrimaryKeyConstraint, PrimaryKeyConstraintFn } from "./constraints/primary-key.mjs";
 import { UniqueConstraint, UniqueConstraintFn } from "./constraints/unique.mjs";
 import { Index } from "./indexes.mjs";
 import { Column } from "./columns/common.mjs";
-import { CamelToSnake } from "./types.mjs";
 import { Check, CheckBuilder, CheckExpr } from "./constraints/check.mjs";
 
 //#region src/table.d.ts

package/dist/src/types.d.mts

@@ -1,4 +1,11 @@
 //#region src/types.d.ts
 type CamelToSnake<S extends string> = S extends `${infer Head}${infer Tail}` ? Head extends Uppercase<Head> ? `_${Lowercase<Head>}${CamelToSnake<Tail>}` : `${Head}${CamelToSnake<Tail>}` : S;
+type Key = string | number | symbol;
+type Valueof<T> = T extends any ? T[keyof T] : never;
+type SelfOrArray<T> = T | T[];
+type SelfOrReadonly<T> = T | Readonly<T>;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+type Is<T, U> = T extends U ? true : false;
+type Prettify<T> = { [K in keyof T]: T[K] } & {};
 //#endregion
-export { CamelToSnake };
+export { CamelToSnake, Is, Key, Prettify, SelfOrArray, SelfOrReadonly, UnionToIntersection, Valueof };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "durcno",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "A PostgreSQL Query Builder and Migration Manager for TypeScript, from the future.",
   "license": "Apache-2.0",
   "homepage": "https://durcno.dev",