kysely 0.9.0 → 0.9.4

package/dist/cjs/schema/create-table-builder.js

@@ -11,6 +11,9 @@ const column_node_js_1 = require("../operation-node/column-node.js");
 const table_node_js_1 = require("../operation-node/table-node.js");
 const foreign_key_constraint_builder_js_1 = require("./foreign-key-constraint-builder.js");
 const data_type_parser_js_1 = require("../parser/data-type-parser.js");
+const primary_constraint_node_js_1 = require("../operation-node/primary-constraint-node.js");
+const unique_constraint_node_js_1 = require("../operation-node/unique-constraint-node.js");
+const check_constraint_node_js_1 = require("../operation-node/check-constraint-node.js");
 /**
  * This builder can be used to create a `create table` query.
  */
@@ -95,7 +98,7 @@ class CreateTableBuilder {
     addPrimaryKeyConstraint(constraintName, columns) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithPrimaryKeyConstraint(this.#props.createTableNode, constraintName, columns),
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithConstraint(this.#props.createTableNode, primary_constraint_node_js_1.PrimaryConstraintNode.create(columns, constraintName)),
         });
     }
     /**
@@ -112,7 +115,7 @@ class CreateTableBuilder {
     addUniqueConstraint(constraintName, columns) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithUniqueConstraint(this.#props.createTableNode, constraintName, columns),
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithConstraint(this.#props.createTableNode, unique_constraint_node_js_1.UniqueConstraintNode.create(columns, constraintName)),
         });
     }
     /**
@@ -129,7 +132,7 @@ class CreateTableBuilder {
     addCheckConstraint(constraintName, checkExpression) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithCheckConstraint(this.#props.createTableNode, constraintName, checkExpression),
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithConstraint(this.#props.createTableNode, check_constraint_node_js_1.CheckConstraintNode.create(checkExpression, constraintName)),
         });
     }
     /**
@@ -163,7 +166,7 @@ class CreateTableBuilder {
         const builder = build(new foreign_key_constraint_builder_js_1.ForeignKeyConstraintBuilder(foreign_key_constraint_node_js_1.ForeignKeyConstraintNode.create(columns.map(column_node_js_1.ColumnNode.create), table_node_js_1.TableNode.create(targetTable), targetColumns.map(column_node_js_1.ColumnNode.create), constraintName)));
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithForeignKeyConstraint(this.#props.createTableNode, builder.toOperationNode()),
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithConstraint(this.#props.createTableNode, builder.toOperationNode()),
         });
     }
     toOperationNode() {

package/dist/cjs/util/log.d.ts

@@ -0,0 +1,8 @@
+import { ArrayItemType } from './type-utils.js';
+export declare const LOG_LEVELS: readonly ["query"];
+export declare type LogLevel = ArrayItemType<typeof LOG_LEVELS>;
+export declare class Log {
+    #private;
+    constructor(levels: ReadonlyArray<LogLevel>);
+    query(callback: (log: (message: string) => void) => void): void;
+}

package/dist/cjs/util/log.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Log = exports.LOG_LEVELS = void 0;
+exports.LOG_LEVELS = ['query'];
+class Log {
+    #levels;
+    constructor(levels) {
+        this.#levels = {
+            query: levels.includes('query'),
+        };
+    }
+    query(callback) {
+        if (this.#levels.query) {
+            callback(this.#query);
+        }
+    }
+    #query(message) {
+        console.log(`kysely:query: ${message}`);
+    }
+}
+exports.Log = Log;

package/dist/cjs/util/object-utils.d.ts

@@ -1,16 +1,16 @@
 /// <reference types="node" />
 export declare type PrimitiveValue = string | number | boolean | null | Date | Buffer | BigInt;
-export declare function isEmpty(obj: ArrayLike<any> | string | object | Buffer): boolean;
-export declare function isString(obj: any): obj is string;
-export declare function isNumber(obj: any): obj is number;
-export declare function isBoolean(obj: any): obj is boolean;
-export declare function isNull(obj: any): obj is null;
-export declare function isDate(obj: any): obj is Date;
-export declare function isBuffer(obj: any): obj is Buffer;
-export declare function isBigInt(obj: any): obj is BigInt;
-export declare function isPrimitive(obj: any): obj is PrimitiveValue;
-export declare function isFunction(obj: any): obj is Function;
-export declare function isObject(obj: any): obj is Record<string, any>;
+export declare function isEmpty(obj: ArrayLike<unknown> | string | object | Buffer): boolean;
+export declare function isString(obj: unknown): obj is string;
+export declare function isNumber(obj: unknown): obj is number;
+export declare function isBoolean(obj: unknown): obj is boolean;
+export declare function isNull(obj: unknown): obj is null;
+export declare function isDate(obj: unknown): obj is Date;
+export declare function isBuffer(obj: unknown): obj is Buffer;
+export declare function isBigInt(obj: unknown): obj is BigInt;
+export declare function isPrimitive(obj: unknown): obj is PrimitiveValue;
+export declare function isFunction(obj: unknown): obj is Function;
+export declare function isObject(obj: unknown): obj is Record<string, unknown>;
 export declare function getLast<T>(arr: ArrayLike<T>): T | undefined;
 export declare function freeze<T>(obj: T): Readonly<T>;
 export declare function asArray<T>(arg: T | T[]): T[];

package/dist/cjs/util/object-utils.js

@@ -54,7 +54,7 @@ function isFunction(obj) {
 }
 exports.isFunction = isFunction;
 function isObject(obj) {
-    return obj && typeof obj === 'object';
+    return typeof obj === 'object' && obj !== null;
 }
 exports.isObject = isObject;
 function getLast(arr) {

package/dist/cjs/util/random-string.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomString = void 0;
 const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 function randomString(length) {
-    let chars = new Array(length);
+    let chars = '';
     for (let i = 0; i < length; ++i) {
-        chars[i] = CHARS[Math.floor(Math.random() * CHARS.length)];
+        chars += randomChar();
     }
-    return chars.join('');
+    return chars;
 }
 exports.randomString = randomString;
+function randomChar() {
+    return CHARS[Math.floor(Math.random() * CHARS.length)];
+}

package/dist/cjs/util/type-utils.d.ts

@@ -136,19 +136,19 @@ export declare type RawBuilderFactory<DB, TB extends keyof DB> = (qb: Expression
 export declare type AliasedRawBuilderFactory<DB, TB extends keyof DB> = (qb: ExpressionBuilder<DB, TB>) => AnyAliasedRawBuilder;
 export interface InsertResultTypeTag {
     /** @internal */
-    __isInsertResultTypeTag__: true;
+    readonly __isInsertResultTypeTag__: true;
 }
 export interface DeleteResultTypeTag {
     /** @internal */
-    __isDeleteResultTypeTag__: true;
+    readonly __isDeleteResultTypeTag__: true;
 }
 export interface UpdateResultTypeTag {
     /** @internal */
-    __isUpdateResultTypeTag__: true;
+    readonly __isUpdateResultTypeTag__: true;
 }
 export interface GeneratedPlaceholder {
     /** @internal */
-    __isGeneratedPlaceholder__: true;
+    readonly __isGeneratedPlaceholder__: true;
 }
 export declare type ManyResultRowType<O> = O extends InsertResultTypeTag ? number | undefined : O extends DeleteResultTypeTag ? number : O extends UpdateResultTypeTag ? number : O;
 export declare type SingleResultRowType<O> = O extends InsertResultTypeTag ? number | undefined : O extends DeleteResultTypeTag ? number : O extends UpdateResultTypeTag ? number : O | undefined;

package/dist/esm/dialect/mysql/mysql-dialect.d.ts

@@ -5,6 +5,13 @@ import { Dialect } from '../dialect.js';
 import { DatabaseIntrospector } from '../../introspection/database-introspector.js';
 import { DialectAdapter } from '../dialect-adapter.js';
 import { DatabaseConnection } from '../../driver/database-connection.js';
+/**
+ * MySQL dialect that uses the [mysql2](https://github.com/sidorares/node-mysql2#readme) library.
+ *
+ * The {@link MysqlDialectConfig | configuration} passed to the constructor
+ * is given as-is to the mysql2 library's [createPool](https://github.com/sidorares/node-mysql2#using-connection-pools)
+ * method.
+ */
 export declare class MysqlDialect implements Dialect {
     #private;
     constructor(config: MysqlDialectConfig);
@@ -17,6 +24,8 @@ export declare class MysqlDialect implements Dialect {
  * Config for the mysql dialect.
  *
  * This interface is equal to `mysql2` library's pool config.
+ *
+ * https://github.com/sidorares/node-mysql2#using-connection-pools
  */
 export interface MysqlDialectConfig {
     /**

package/dist/esm/dialect/mysql/mysql-dialect.js

@@ -2,6 +2,13 @@ import { MysqlDriver } from './mysql-driver.js';
 import { MysqlQueryCompiler } from './mysql-query-compiler.js';
 import { MysqlIntrospector } from './mysql-introspector.js';
 import { MysqlAdapter } from './mysql-adapter.js';
+/**
+ * MySQL dialect that uses the [mysql2](https://github.com/sidorares/node-mysql2#readme) library.
+ *
+ * The {@link MysqlDialectConfig | configuration} passed to the constructor
+ * is given as-is to the mysql2 library's [createPool](https://github.com/sidorares/node-mysql2#using-connection-pools)
+ * method.
+ */
 export class MysqlDialect {
     #config;
     constructor(config) {

package/dist/esm/dialect/mysql/mysql-driver.js

@@ -1,4 +1,4 @@
-import { isFunction, isObject } from '../../util/object-utils.js';
+import { isFunction, isNumber, isObject } from '../../util/object-utils.js';
 const PRIVATE_RELEASE_METHOD = Symbol();
 export class MysqlDriver {
     #config;
@@ -103,13 +103,13 @@ class MysqlConnection {
     async executeQuery(compiledQuery) {
         const result = await this.#executeQuery(compiledQuery);
         if (isObject(result) && 'insertId' in result && 'affectedRows' in result) {
-            if (result.insertId) {
+            if (isNumber(result.insertId) && result.insertId > 0) {
                 return {
                     insertedPrimaryKey: result.insertId,
                     rows: [],
                 };
             }
-            else {
+            else if (isNumber(result.affectedRows)) {
                 return {
                     numUpdatedOrDeletedRows: result.affectedRows,
                     rows: [],

package/dist/esm/dialect/postgres/postgres-dialect.d.ts

@@ -8,6 +8,16 @@ import { Dialect } from '../dialect.js';
 import { DatabaseIntrospector } from '../../introspection/database-introspector.js';
 import { DialectAdapter } from '../dialect-adapter.js';
 import { DatabaseConnection } from '../../driver/database-connection.js';
+/**
+ * PostgreSQL dialect that uses the [pg](https://node-postgres.com/) library.
+ *
+ * The {@link PostgresDialectConfig | configuration} passed to the constructor
+ * is given as-is to the pg library's [Pool](https://node-postgres.com/api/pool)
+ * constructor. See the following two links for more documentation:
+ *
+ * https://node-postgres.com/api/pool
+ * https://node-postgres.com/api/client
+ */
 export declare class PostgresDialect implements Dialect {
     #private;
     constructor(config: PostgresDialectConfig);
@@ -19,7 +29,7 @@ export declare class PostgresDialect implements Dialect {
 /**
  * Config for the postgres dialect.
  *
- * This interface is equal to `pg` library's pool config:
+ * This interface is equal to `pg` library's `Pool` config:
  *
  * https://node-postgres.com/api/pool
  * https://node-postgres.com/api/client

package/dist/esm/dialect/postgres/postgres-dialect.js

@@ -2,6 +2,16 @@ import { PostgresDriver } from './postgres-driver.js';
 import { PostgresIntrospector } from './postgres-introspector.js';
 import { PostgresQueryCompiler } from './postgres-query-compiler.js';
 import { PostgresAdapter } from './postgres-adapter.js';
+/**
+ * PostgreSQL dialect that uses the [pg](https://node-postgres.com/) library.
+ *
+ * The {@link PostgresDialectConfig | configuration} passed to the constructor
+ * is given as-is to the pg library's [Pool](https://node-postgres.com/api/pool)
+ * constructor. See the following two links for more documentation:
+ *
+ * https://node-postgres.com/api/pool
+ * https://node-postgres.com/api/client
+ */
 export class PostgresDialect {
     #config;
     constructor(config) {

package/dist/esm/driver/runtime-driver.d.ts

@@ -1,3 +1,4 @@
+import { Log } from '../util/log.js';
 import { DatabaseConnection } from './database-connection.js';
 import { Driver, TransactionSettings } from './driver.js';
 /**
@@ -7,10 +8,10 @@ import { Driver, TransactionSettings } from './driver.js';
  */
 export declare class RuntimeDriver implements Driver {
     #private;
-    constructor(driver: Driver);
+    constructor(driver: Driver, log: Log);
     init(): Promise<void>;
     acquireConnection(): Promise<DatabaseConnection>;
-    releaseConnection(connection: DatabaseConnection): Promise<void>;
+    releaseConnection(runtimeConnection: DatabaseConnection): Promise<void>;
     beginTransaction(connection: DatabaseConnection, settings: TransactionSettings): Promise<void>;
     commitTransaction(connection: DatabaseConnection): Promise<void>;
     rollbackTransaction(connection: DatabaseConnection): Promise<void>;

package/dist/esm/driver/runtime-driver.js

@@ -5,10 +5,13 @@
  */
 export class RuntimeDriver {
     #driver;
+    #log;
     #initPromise;
     #destroyPromise;
-    constructor(driver) {
+    #connections = new WeakMap();
+    constructor(driver, log) {
         this.#driver = driver;
+        this.#log = log;
     }
     async init() {
         if (!this.#initPromise) {
@@ -21,10 +24,18 @@ export class RuntimeDriver {
     }
     async acquireConnection() {
         await this.init();
-        return this.#driver.acquireConnection();
+        const connection = await this.#driver.acquireConnection();
+        let runtimeConnection = this.#connections.get(connection);
+        if (!runtimeConnection) {
+            runtimeConnection = new RuntimeConnection(connection, this.#log);
+            this.#connections.set(connection, runtimeConnection);
+        }
+        return runtimeConnection;
     }
-    releaseConnection(connection) {
-        return this.#driver.releaseConnection(connection);
+    async releaseConnection(runtimeConnection) {
+        if (runtimeConnection instanceof RuntimeConnection) {
+            await this.#driver.releaseConnection(runtimeConnection.connection);
+        }
     }
     beginTransaction(connection, settings) {
         return this.#driver.beginTransaction(connection, settings);
@@ -49,3 +60,31 @@ export class RuntimeDriver {
         await this.#destroyPromise;
     }
 }
+class RuntimeConnection {
+    #connection;
+    #log;
+    get connection() {
+        return this.#connection;
+    }
+    constructor(connection, log) {
+        this.#connection = connection;
+        this.#log = log;
+    }
+    async executeQuery(compiledQuery) {
+        const startTime = process.hrtime.bigint();
+        try {
+            return await this.#connection.executeQuery(compiledQuery);
+        }
+        finally {
+            this.#log.query((log) => {
+                log(compiledQuery.sql);
+                log(`duration: ${this.#calculateDurationMillis(startTime)}ms`);
+            });
+        }
+    }
+    #calculateDurationMillis(startTime) {
+        const endTime = process.hrtime.bigint();
+        const durationTensMillis = Number((endTime - startTime) / 100000n);
+        return durationTensMillis / 10;
+    }
+}

package/dist/esm/index.d.ts

@@ -110,7 +110,7 @@ export * from './operation-node/operation-node-source.js';
 export * from './operation-node/order-by-node.js';
 export * from './introspection/database-introspector.js';
 export * from './util/compilable.js';
-export { AnyColumn, UnknownRow as AnyRow } from './util/type-utils.js';
+export { AnyColumn, UnknownRow, AnyQueryBuilder } from './util/type-utils.js';
 export { SelectExpression, SelectExpressionOrList, } from './parser/select-parser.js';
 export { ReferenceExpression, ReferenceExpressionOrList, } from './parser/reference-parser.js';
 export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';

package/dist/esm/kysely.d.ts

@@ -10,6 +10,7 @@ import { DatabaseIntrospector } from './introspection/database-introspector.js';
 import { Driver, IsolationLevel } from './driver/driver.js';
 import { ParseContext } from './parser/parse-context.js';
 import { FunctionBuilder } from './query-builder/function-builder.js';
+import { LogLevel } from './util/log.js';
 /**
  * The main Kysely class.
  *
@@ -127,15 +128,20 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      */
     get fn(): FunctionBuilder<DB, keyof DB>;
     /**
-     * Starts a transaction. If the callback throws the transaction is rolled back,
-     * otherwise it's committed.
+     * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.
      *
-     * @example
-     * In the example below if either query fails or `someFunction` throws, both inserts
-     * will be rolled back. Otherwise the transaction will be committed by the time the
-     * `transaction` function returns the output value. The output value of the
-     * `transaction` method is the value returned from the callback.
+     * The returned {@link TransactionBuilder} can be used to configure the transaction. The
+     * {@link TransactionBuilder.execute} method can then be called to run the transaction.
+     * {@link TransactionBuilder.execute} takes a function that is run inside the
+     * transaction. If the function throws, the transaction is rolled back. Otherwise
+     * the transaction is committed.
+     *
+     * The callback function passed to the {@link TransactionBuilder.execute | execute}
+     * method gets the transaction object as its only argument. The transaction is
+     * of type {@link Transaction} which inherits {@link Kysely}. Any query
+     * started through the transaction object is executed inside the transaction.
      *
+     * @example
      * ```ts
      * const catto = await db.transaction().execute(async (trx) => {
      *   const jennifer = await trx.insertInto('person')
@@ -220,8 +226,19 @@ export interface KyselyProps {
 }
 export declare function isKyselyProps(obj: unknown): obj is KyselyProps;
 export interface KyselyConfig {
-    dialect: Dialect;
-    plugins?: KyselyPlugin[];
+    readonly dialect: Dialect;
+    readonly plugins?: KyselyPlugin[];
+    /**
+     * A list of log levels to log.
+     *
+     * Currently there's only one level: `query` and it's logged using
+     * `console.log`. This will be expanded based on user request later.
+     *
+     * Log levels:
+     *
+     *  - query: Log each query's SQL and duration.
+     */
+    readonly log?: ReadonlyArray<LogLevel>;
 }
 export declare class ConnectionBuilder<DB> {
     #private;

package/dist/esm/kysely.js

@@ -12,6 +12,7 @@ import { TRANSACTION_ISOLATION_LEVELS, } from './driver/driver.js';
 import { preventAwait } from './util/prevent-await.js';
 import { DefaultParseContext } from './parser/parse-context.js';
 import { FunctionBuilder } from './query-builder/function-builder.js';
+import { Log } from './util/log.js';
 /**
  * The main Kysely class.
  *
@@ -57,15 +58,16 @@ export class Kysely extends QueryCreator {
     constructor(args) {
         if (isKyselyProps(args)) {
             super({ executor: args.executor, parseContext: args.parseContext });
-            this.#props = freeze(args);
+            this.#props = freeze({ ...args });
         }
         else {
             const dialect = args.dialect;
             const driver = dialect.createDriver();
             const compiler = dialect.createQueryCompiler();
             const adapter = dialect.createAdapter();
+            const log = new Log(args.log ?? []);
             const parseContext = new DefaultParseContext(adapter);
-            const runtimeDriver = new RuntimeDriver(driver);
+            const runtimeDriver = new RuntimeDriver(driver, log);
             const connectionProvider = new DefaultConnectionProvider(runtimeDriver);
             const executor = new DefaultQueryExecutor(compiler, connectionProvider, args.plugins ?? []);
             super({ executor, parseContext });
@@ -163,15 +165,20 @@ export class Kysely extends QueryCreator {
         return new FunctionBuilder({ executor: this.#props.executor });
     }
     /**
-     * Starts a transaction. If the callback throws the transaction is rolled back,
-     * otherwise it's committed.
+     * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.
      *
-     * @example
-     * In the example below if either query fails or `someFunction` throws, both inserts
-     * will be rolled back. Otherwise the transaction will be committed by the time the
-     * `transaction` function returns the output value. The output value of the
-     * `transaction` method is the value returned from the callback.
+     * The returned {@link TransactionBuilder} can be used to configure the transaction. The
+     * {@link TransactionBuilder.execute} method can then be called to run the transaction.
+     * {@link TransactionBuilder.execute} takes a function that is run inside the
+     * transaction. If the function throws, the transaction is rolled back. Otherwise
+     * the transaction is committed.
+     *
+     * The callback function passed to the {@link TransactionBuilder.execute | execute}
+     * method gets the transaction object as its only argument. The transaction is
+     * of type {@link Transaction} which inherits {@link Kysely}. Any query
+     * started through the transaction object is executed inside the transaction.
      *
+     * @example
      * ```ts
      * const catto = await db.transaction().execute(async (trx) => {
      *   const jennifer = await trx.insertInto('person')

package/dist/esm/migration/migration.d.ts

@@ -24,6 +24,38 @@ export declare class MigrationModule {
      *   path.join(__dirname, 'migrations')
      * )
      * ```
+     *
+     * In the next example, we use a record of migration objects instead of file folder path.
+     * The keys in the object are migration names that can be anything you want. The order of
+     * the migrations is determined based on the alphabetical order of the keys in the record.
+     * This can be useful if you are using a bundler like webpack or esbuild.
+     *
+     * @example
+     * ```ts
+     * await db.migration.migrateToLatest({
+     *   migration1: {
+     *     async up(db: Kysely<any>): Promise<void> {
+     *       ...
+     *     },
+     *
+     *     async down(db: Kysely<any>): Promise<void> {
+     *       ...
+     *     }
+     *   },
+     *
+     *   migration2: {
+     *     async up(db: Kysely<any>): Promise<void> {
+     *       ...
+     *     },
+     *
+     *     async down(db: Kysely<any>): Promise<void> {
+     *       ...
+     *     }
+     *   },
+     *
+     *  ...
+     * })
+     * ```
      */
     migrateToLatest(migrationsFolderPath: string): Promise<void>;
     migrateToLatest(allMigrations: Record<string, Migration>): Promise<void>;

package/dist/esm/operation-node/create-schema-node.d.ts

@@ -13,5 +13,5 @@ export interface CreateSchemaNode extends OperationNode {
 export declare const CreateSchemaNode: Readonly<{
     is(node: OperationNode): node is CreateSchemaNode;
     create(schema: string, params?: CreateSchemaNodeParams | undefined): CreateSchemaNode;
-    cloneWithModifier(createSchema: CreateSchemaNode, modifier: CreateSchemaNodeModifier): CreateSchemaNode;
+    cloneWith(createSchema: CreateSchemaNode, params: CreateSchemaNodeParams): CreateSchemaNode;
 }>;

package/dist/esm/operation-node/create-schema-node.js

@@ -14,10 +14,10 @@ export const CreateSchemaNode = freeze({
             ...params,
         });
     },
-    cloneWithModifier(createSchema, modifier) {
+    cloneWith(createSchema, params) {
         return freeze({
             ...createSchema,
-            modifier,
+            ...params,
         });
     },
 });

package/dist/esm/operation-node/create-table-node.d.ts

@@ -1,6 +1,5 @@
 import { OperationNode } from './operation-node.js';
 import { TableNode } from './table-node.js';
-import { ForeignKeyConstraintNode } from './foreign-key-constraint-node.js';
 import { ConstraintNode } from './constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
 export declare type CreateTableNodeModifier = 'IfNotExists';
@@ -19,8 +18,5 @@ export declare const CreateTableNode: Readonly<{
     create(table: TableNode): CreateTableNode;
     cloneWithColumn(createTable: CreateTableNode, column: ColumnDefinitionNode): CreateTableNode;
     cloneWithModifier(createTable: CreateTableNode, modifier: CreateTableNodeModifier): CreateTableNode;
-    cloneWithPrimaryKeyConstraint(createTable: CreateTableNode, constraintName: string, columns: string[]): CreateTableNode;
-    cloneWithUniqueConstraint(createTable: CreateTableNode, constraintName: string, columns: string[]): CreateTableNode;
-    cloneWithCheckConstraint(createTable: CreateTableNode, constraintName: string, sql: string): CreateTableNode;
-    cloneWithForeignKeyConstraint(createTable: CreateTableNode, constraint: ForeignKeyConstraintNode): CreateTableNode;
+    cloneWithConstraint(createTable: CreateTableNode, constraint: ConstraintNode): CreateTableNode;
 }>;

package/dist/esm/operation-node/create-table-node.js

@@ -1,7 +1,4 @@
 import { freeze } from '../util/object-utils.js';
-import { CheckConstraintNode } from './check-constraint-node.js';
-import { PrimaryConstraintNode } from './primary-constraint-node.js';
-import { UniqueConstraintNode } from './unique-constraint-node.js';
 /**
  * @internal
  */
@@ -28,34 +25,7 @@ export const CreateTableNode = freeze({
             modifier,
         });
     },
-    cloneWithPrimaryKeyConstraint(createTable, constraintName, columns) {
-        const constraint = PrimaryConstraintNode.create(columns, constraintName);
-        return freeze({
-            ...createTable,
-            constraints: createTable.constraints
-                ? freeze([...createTable.constraints, constraint])
-                : freeze([constraint]),
-        });
-    },
-    cloneWithUniqueConstraint(createTable, constraintName, columns) {
-        const constraint = UniqueConstraintNode.create(columns, constraintName);
-        return freeze({
-            ...createTable,
-            constraints: createTable.constraints
-                ? freeze([...createTable.constraints, constraint])
-                : freeze([constraint]),
-        });
-    },
-    cloneWithCheckConstraint(createTable, constraintName, sql) {
-        const constraint = CheckConstraintNode.create(sql, constraintName);
-        return freeze({
-            ...createTable,
-            constraints: createTable.constraints
-                ? freeze([...createTable.constraints, constraint])
-                : freeze([constraint]),
-        });
-    },
-    cloneWithForeignKeyConstraint(createTable, constraint) {
+    cloneWithConstraint(createTable, constraint) {
         return freeze({
             ...createTable,
             constraints: createTable.constraints

package/dist/esm/operation-node/join-node.d.ts

@@ -21,5 +21,6 @@ export declare const JoinNode: Readonly<{
     is(node: OperationNode): node is JoinNode;
     create(joinType: JoinType, table: JoinTableNode): JoinNode;
     createWithOn(joinType: JoinType, table: JoinTableNode, on: JoinNodeOnNode): JoinNode;
-    cloneWithOn(joinNode: JoinNode, op: 'And' | 'Or', on: JoinNodeOnNode): JoinNode;
+    cloneWithOn(joinNode: JoinNode, on: JoinNodeOnNode): JoinNode;
+    cloneWithOrOn(joinNode: JoinNode, on: JoinNodeOnNode): JoinNode;
 }>;

package/dist/esm/operation-node/join-node.js

@@ -24,14 +24,16 @@ export const JoinNode = freeze({
             on,
         });
     },
-    cloneWithOn(joinNode, op, on) {
+    cloneWithOn(joinNode, on) {
         return freeze({
             ...joinNode,
-            on: joinNode.on
-                ? op === 'And'
-                    ? AndNode.create(joinNode.on, on)
-                    : OrNode.create(joinNode.on, on)
-                : on,
+            on: joinNode.on ? AndNode.create(joinNode.on, on) : on,
+        });
+    },
+    cloneWithOrOn(joinNode, on) {
+        return freeze({
+            ...joinNode,
+            on: joinNode.on ? OrNode.create(joinNode.on, on) : on,
         });
     },
 });

package/dist/esm/operation-node/operation-node-source.d.ts

@@ -2,4 +2,4 @@ import { OperationNode } from './operation-node.js';
 export interface OperationNodeSource {
     toOperationNode(): OperationNode;
 }
-export declare function isOperationNodeSource(obj: any): obj is OperationNodeSource;
+export declare function isOperationNodeSource(obj: unknown): obj is OperationNodeSource;