kysely 0.10.1 → 0.11.3

package/dist/cjs/driver/database-connection.d.ts

@@ -12,12 +12,12 @@ export interface QueryResult<O> {
      * This is defined for update and delete queries and contains
      * the number of rows the query updated/deleted.
      */
-    readonly numUpdatedOrDeletedRows?: number;
+    readonly numUpdatedOrDeletedRows?: bigint;
     /**
      * This is defined for insert queries on dialects that return
      * the auto incrementing primary key from an insert.
      */
-    readonly insertedPrimaryKey?: number;
+    readonly insertId?: bigint;
     /**
      * The rows returned by the query. This is always defined and is
      * empty if the query returned no rows.

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

@@ -97,7 +97,7 @@ class RuntimeConnection {
     #logQuery(compiledQuery, startTime) {
         this.#log.query(() => ({
             level: 'query',
-            sql: compiledQuery.sql,
+            query: compiledQuery,
             queryDurationMillis: this.#calculateDurationMillis(startTime),
         }));
     }

package/dist/cjs/index.d.ts

@@ -3,6 +3,9 @@ export * from './query-creator.js';
 export * from './query-builder/query-builder.js';
 export * from './query-builder/join-builder.js';
 export * from './query-builder/expression-builder.js';
+export * from './query-builder/insert-result.js';
+export * from './query-builder/delete-result.js';
+export * from './query-builder/update-result.js';
 export * from './raw-builder/raw-builder.js';
 export * from './query-executor/query-executor.js';
 export * from './query-executor/default-query-executor.js';
@@ -37,41 +40,19 @@ export * from './dialect/mysql/mysql-query-compiler.js';
 export * from './dialect/mysql/mysql-driver.js';
 export * from './dialect/mysql/mysql-introspector.js';
 export * from './dialect/mysql/mysql-adapter.js';
+export * from './dialect/sqlite/sqlite-dialect.js';
+export * from './dialect/sqlite/sqlite-query-compiler.js';
+export * from './dialect/sqlite/sqlite-driver.js';
+export * from './dialect/sqlite/sqlite-introspector.js';
+export * from './dialect/sqlite/sqlite-adapter.js';
 export * from './query-compiler/default-query-compiler.js';
 export * from './query-compiler/query-compiler.js';
 export * from './migration/migration.js';
 export * from './dialect/dialect.js';
 export * from './dialect/dialect-adapter.js';
 export * from './dialect/dialect-adapter-base.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-visitor.js';
 export * from './plugin/kysely-plugin.js';
 export * from './plugin/camel-case/camel-case-plugin.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-visitor.js';
-export * from './operation-node/operator-node.js';
-export * from './operation-node/or-node.js';
-export * from './operation-node/order-by-item-node.js';
-export * from './operation-node/order-by-node.js';
-export * from './operation-node/parens-node.js';
-export * from './operation-node/primary-constraint-node.js';
-export * from './operation-node/primitive-value-list-node.js';
-export * from './operation-node/query-node.js';
-export * from './operation-node/raw-node.js';
-export * from './operation-node/reference-node.js';
-export * from './operation-node/references-node.js';
-export * from './operation-node/rename-column-node.js';
-export * from './operation-node/returning-node.js';
-export * from './operation-node/select-all-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/selection-node.js';
-export * from './operation-node/table-node.js';
-export * from './operation-node/unique-constraint-node.js';
-export * from './operation-node/update-query-node.js';
-export * from './operation-node/value-list-node.js';
-export * from './operation-node/value-node.js';
-export * from './operation-node/where-node.js';
-export * from './operation-node/with-node.js';
 export * from './operation-node/add-column-node.js';
 export * from './operation-node/add-constraint-node.js';
 export * from './operation-node/alias-node.js';
@@ -87,16 +68,20 @@ export * from './operation-node/constraint-node.js';
 export * from './operation-node/create-index-node.js';
 export * from './operation-node/create-schema-node.js';
 export * from './operation-node/create-table-node.js';
+export * from './operation-node/create-view-node.js';
 export * from './operation-node/data-type-node.js';
+export * from './operation-node/default-value-node.js';
 export * from './operation-node/delete-query-node.js';
 export * from './operation-node/drop-column-node.js';
 export * from './operation-node/drop-constraint-node.js';
 export * from './operation-node/drop-index-node.js';
 export * from './operation-node/drop-schema-node.js';
 export * from './operation-node/drop-table-node.js';
+export * from './operation-node/drop-view-node.js';
 export * from './operation-node/filter-node.js';
 export * from './operation-node/foreign-key-constraint-node.js';
 export * from './operation-node/from-node.js';
+export * from './operation-node/generated-always-as-node.js';
 export * from './operation-node/group-by-item-node.js';
 export * from './operation-node/group-by-node.js';
 export * from './operation-node/having-node.js';
@@ -105,19 +90,50 @@ export * from './operation-node/insert-query-node.js';
 export * from './operation-node/join-node.js';
 export * from './operation-node/limit-node.js';
 export * from './operation-node/list-node.js';
+export * from './operation-node/modify-column-node.js';
 export * from './operation-node/offset-node.js';
-export * from './operation-node//on-conflict-node.js';
-export * from './operation-node/operation-node.js';
+export * from './operation-node/on-conflict-node.js';
+export * from './operation-node/on-duplicate-key-node.js';
+export * from './operation-node/on-node.js';
 export * from './operation-node/operation-node-source.js';
+export * from './operation-node/operation-node-transformer.js';
+export * from './operation-node/operation-node-utils.js';
+export * from './operation-node/operation-node-visitor.js';
+export * from './operation-node/operation-node.js';
+export * from './operation-node/operator-node.js';
+export * from './operation-node/or-node.js';
+export * from './operation-node/order-by-item-node.js';
 export * from './operation-node/order-by-node.js';
+export * from './operation-node/parens-node.js';
+export * from './operation-node/primary-constraint-node.js';
+export * from './operation-node/primitive-value-list-node.js';
+export * from './operation-node/query-node.js';
+export * from './operation-node/raw-node.js';
+export * from './operation-node/reference-node.js';
+export * from './operation-node/references-node.js';
+export * from './operation-node/rename-column-node.js';
+export * from './operation-node/returning-node.js';
+export * from './operation-node/select-all-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/selection-node.js';
+export * from './operation-node/table-node.js';
+export * from './operation-node/union-node.js';
+export * from './operation-node/unique-constraint-node.js';
+export * from './operation-node/update-query-node.js';
+export * from './operation-node/value-list-node.js';
+export * from './operation-node/value-node.js';
+export * from './operation-node/where-node.js';
+export * from './operation-node/with-node.js';
 export * from './introspection/database-introspector.js';
 export * from './util/compilable.js';
+export * from './util/log.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';
 export { ExistsExpression, FilterOperator } from './parser/filter-parser.js';
-export { TableExpression } from './parser/table-parser.js';
+export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
 export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
 export { InsertObject } from './parser/insert-values-parser.js';
 export { MutationObject } from './parser/update-set-parser.js';

package/dist/cjs/index.js

@@ -15,6 +15,9 @@ __exportStar(require("./query-creator.js"), exports);
 __exportStar(require("./query-builder/query-builder.js"), exports);
 __exportStar(require("./query-builder/join-builder.js"), exports);
 __exportStar(require("./query-builder/expression-builder.js"), exports);
+__exportStar(require("./query-builder/insert-result.js"), exports);
+__exportStar(require("./query-builder/delete-result.js"), exports);
+__exportStar(require("./query-builder/update-result.js"), exports);
 __exportStar(require("./raw-builder/raw-builder.js"), exports);
 __exportStar(require("./query-executor/query-executor.js"), exports);
 __exportStar(require("./query-executor/default-query-executor.js"), exports);
@@ -49,41 +52,19 @@ __exportStar(require("./dialect/mysql/mysql-query-compiler.js"), exports);
 __exportStar(require("./dialect/mysql/mysql-driver.js"), exports);
 __exportStar(require("./dialect/mysql/mysql-introspector.js"), exports);
 __exportStar(require("./dialect/mysql/mysql-adapter.js"), exports);
+__exportStar(require("./dialect/sqlite/sqlite-dialect.js"), exports);
+__exportStar(require("./dialect/sqlite/sqlite-query-compiler.js"), exports);
+__exportStar(require("./dialect/sqlite/sqlite-driver.js"), exports);
+__exportStar(require("./dialect/sqlite/sqlite-introspector.js"), exports);
+__exportStar(require("./dialect/sqlite/sqlite-adapter.js"), exports);
 __exportStar(require("./query-compiler/default-query-compiler.js"), exports);
 __exportStar(require("./query-compiler/query-compiler.js"), exports);
 __exportStar(require("./migration/migration.js"), exports);
 __exportStar(require("./dialect/dialect.js"), exports);
 __exportStar(require("./dialect/dialect-adapter.js"), exports);
 __exportStar(require("./dialect/dialect-adapter-base.js"), exports);
-__exportStar(require("./operation-node/operation-node-transformer.js"), exports);
-__exportStar(require("./operation-node/operation-node-visitor.js"), exports);
 __exportStar(require("./plugin/kysely-plugin.js"), exports);
 __exportStar(require("./plugin/camel-case/camel-case-plugin.js"), exports);
-__exportStar(require("./operation-node/operation-node-transformer.js"), exports);
-__exportStar(require("./operation-node/operation-node-visitor.js"), exports);
-__exportStar(require("./operation-node/operator-node.js"), exports);
-__exportStar(require("./operation-node/or-node.js"), exports);
-__exportStar(require("./operation-node/order-by-item-node.js"), exports);
-__exportStar(require("./operation-node/order-by-node.js"), exports);
-__exportStar(require("./operation-node/parens-node.js"), exports);
-__exportStar(require("./operation-node/primary-constraint-node.js"), exports);
-__exportStar(require("./operation-node/primitive-value-list-node.js"), exports);
-__exportStar(require("./operation-node/query-node.js"), exports);
-__exportStar(require("./operation-node/raw-node.js"), exports);
-__exportStar(require("./operation-node/reference-node.js"), exports);
-__exportStar(require("./operation-node/references-node.js"), exports);
-__exportStar(require("./operation-node/rename-column-node.js"), exports);
-__exportStar(require("./operation-node/returning-node.js"), exports);
-__exportStar(require("./operation-node/select-all-node.js"), exports);
-__exportStar(require("./operation-node/select-query-node.js"), exports);
-__exportStar(require("./operation-node/selection-node.js"), exports);
-__exportStar(require("./operation-node/table-node.js"), exports);
-__exportStar(require("./operation-node/unique-constraint-node.js"), exports);
-__exportStar(require("./operation-node/update-query-node.js"), exports);
-__exportStar(require("./operation-node/value-list-node.js"), exports);
-__exportStar(require("./operation-node/value-node.js"), exports);
-__exportStar(require("./operation-node/where-node.js"), exports);
-__exportStar(require("./operation-node/with-node.js"), exports);
 __exportStar(require("./operation-node/add-column-node.js"), exports);
 __exportStar(require("./operation-node/add-constraint-node.js"), exports);
 __exportStar(require("./operation-node/alias-node.js"), exports);
@@ -99,16 +80,20 @@ __exportStar(require("./operation-node/constraint-node.js"), exports);
 __exportStar(require("./operation-node/create-index-node.js"), exports);
 __exportStar(require("./operation-node/create-schema-node.js"), exports);
 __exportStar(require("./operation-node/create-table-node.js"), exports);
+__exportStar(require("./operation-node/create-view-node.js"), exports);
 __exportStar(require("./operation-node/data-type-node.js"), exports);
+__exportStar(require("./operation-node/default-value-node.js"), exports);
 __exportStar(require("./operation-node/delete-query-node.js"), exports);
 __exportStar(require("./operation-node/drop-column-node.js"), exports);
 __exportStar(require("./operation-node/drop-constraint-node.js"), exports);
 __exportStar(require("./operation-node/drop-index-node.js"), exports);
 __exportStar(require("./operation-node/drop-schema-node.js"), exports);
 __exportStar(require("./operation-node/drop-table-node.js"), exports);
+__exportStar(require("./operation-node/drop-view-node.js"), exports);
 __exportStar(require("./operation-node/filter-node.js"), exports);
 __exportStar(require("./operation-node/foreign-key-constraint-node.js"), exports);
 __exportStar(require("./operation-node/from-node.js"), exports);
+__exportStar(require("./operation-node/generated-always-as-node.js"), exports);
 __exportStar(require("./operation-node/group-by-item-node.js"), exports);
 __exportStar(require("./operation-node/group-by-node.js"), exports);
 __exportStar(require("./operation-node/having-node.js"), exports);
@@ -117,10 +102,41 @@ __exportStar(require("./operation-node/insert-query-node.js"), exports);
 __exportStar(require("./operation-node/join-node.js"), exports);
 __exportStar(require("./operation-node/limit-node.js"), exports);
 __exportStar(require("./operation-node/list-node.js"), exports);
+__exportStar(require("./operation-node/modify-column-node.js"), exports);
 __exportStar(require("./operation-node/offset-node.js"), exports);
-__exportStar(require("./operation-node//on-conflict-node.js"), exports);
-__exportStar(require("./operation-node/operation-node.js"), exports);
+__exportStar(require("./operation-node/on-conflict-node.js"), exports);
+__exportStar(require("./operation-node/on-duplicate-key-node.js"), exports);
+__exportStar(require("./operation-node/on-node.js"), exports);
 __exportStar(require("./operation-node/operation-node-source.js"), exports);
+__exportStar(require("./operation-node/operation-node-transformer.js"), exports);
+__exportStar(require("./operation-node/operation-node-utils.js"), exports);
+__exportStar(require("./operation-node/operation-node-visitor.js"), exports);
+__exportStar(require("./operation-node/operation-node.js"), exports);
+__exportStar(require("./operation-node/operator-node.js"), exports);
+__exportStar(require("./operation-node/or-node.js"), exports);
+__exportStar(require("./operation-node/order-by-item-node.js"), exports);
 __exportStar(require("./operation-node/order-by-node.js"), exports);
+__exportStar(require("./operation-node/parens-node.js"), exports);
+__exportStar(require("./operation-node/primary-constraint-node.js"), exports);
+__exportStar(require("./operation-node/primitive-value-list-node.js"), exports);
+__exportStar(require("./operation-node/query-node.js"), exports);
+__exportStar(require("./operation-node/raw-node.js"), exports);
+__exportStar(require("./operation-node/reference-node.js"), exports);
+__exportStar(require("./operation-node/references-node.js"), exports);
+__exportStar(require("./operation-node/rename-column-node.js"), exports);
+__exportStar(require("./operation-node/returning-node.js"), exports);
+__exportStar(require("./operation-node/select-all-node.js"), exports);
+__exportStar(require("./operation-node/select-query-node.js"), exports);
+__exportStar(require("./operation-node/select-query-node.js"), exports);
+__exportStar(require("./operation-node/selection-node.js"), exports);
+__exportStar(require("./operation-node/table-node.js"), exports);
+__exportStar(require("./operation-node/union-node.js"), exports);
+__exportStar(require("./operation-node/unique-constraint-node.js"), exports);
+__exportStar(require("./operation-node/update-query-node.js"), exports);
+__exportStar(require("./operation-node/value-list-node.js"), exports);
+__exportStar(require("./operation-node/value-node.js"), exports);
+__exportStar(require("./operation-node/where-node.js"), exports);
+__exportStar(require("./operation-node/with-node.js"), exports);
 __exportStar(require("./introspection/database-introspector.js"), exports);
 __exportStar(require("./util/compilable.js"), exports);
+__exportStar(require("./util/log.js"), exports);

package/dist/cjs/kysely.d.ts

@@ -10,7 +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';
+import { LogConfig } from './util/log.js';
 /**
  * The main Kysely class.
  *
@@ -116,7 +116,7 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."id", count("pet"."id") as "pet_count"
@@ -146,17 +146,19 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * const catto = await db.transaction().execute(async (trx) => {
      *   const jennifer = await trx.insertInto('person')
      *     .values({
+     *       id: db.generated,
      *       first_name: 'Jennifer',
-     *      last_name: 'Aniston',
+     *       last_name: 'Aniston',
      *     })
      *     .returning('id')
-     *     .executeTakeFirst()
+     *     .executeTakeFirstOrThrow()
      *
      *   await someFunction(trx, jennifer)
      *
      *   return await trx.insertInto('pet')
      *     .values({
-     *       user_id: jennifer!.id,
+     *       id: db.generated,
+     *       user_id: jennifer.id,
      *       name: 'Catto',
      *       species: 'cat'
      *     })
@@ -233,17 +235,33 @@ export interface KyselyConfig {
     readonly dialect: Dialect;
     readonly plugins?: KyselyPlugin[];
     /**
-     * A list of log levels to log.
+     * A list of log levels to log or a custom logger function.
      *
      * Currently there's only two levels: `query` and `error`.
      * This will be expanded based on user feedback later.
      *
-     * Log levels:
+     * @example
+     * ```ts
+     * const db = new Kysely<Database>({
+     *   dialect: new PostgresDialect(postgresConfig),
+     *   log: ['query', 'error']
+     * })
+     * ```
      *
-     *  - query: Log each query's SQL and duration using console.log
-     *  - error: Log all query errors using console.error
+     * @example
+     * ```ts
+     * const db = new Kysely<Database>({
+     *   dialect: new PostgresDialect(postgresConfig),
+     *   log(event): void {
+     *     if (event.level === 'query') {
+     *       console.log(event.query.sql)
+     *       console.log(event.query.parameters)
+     *     }
+     *   }
+     * })
+     * ```
      */
-    readonly log?: ReadonlyArray<LogLevel>;
+    readonly log?: LogConfig;
 }
 export declare class ConnectionBuilder<DB> {
     #private;

package/dist/cjs/kysely.js

@@ -154,7 +154,7 @@ class Kysely extends query_creator_js_1.QueryCreator {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."id", count("pet"."id") as "pet_count"
@@ -186,17 +186,19 @@ class Kysely extends query_creator_js_1.QueryCreator {
      * const catto = await db.transaction().execute(async (trx) => {
      *   const jennifer = await trx.insertInto('person')
      *     .values({
+     *       id: db.generated,
      *       first_name: 'Jennifer',
-     *      last_name: 'Aniston',
+     *       last_name: 'Aniston',
      *     })
      *     .returning('id')
-     *     .executeTakeFirst()
+     *     .executeTakeFirstOrThrow()
      *
      *   await someFunction(trx, jennifer)
      *
      *   return await trx.insertInto('pet')
      *     .values({
-     *       user_id: jennifer!.id,
+     *       id: db.generated,
+     *       user_id: jennifer.id,
      *       name: 'Catto',
      *       species: 'cat'
      *     })

package/dist/cjs/migration/migration.d.ts

@@ -62,5 +62,5 @@ export declare class MigrationModule {
 }
 export interface Migration {
     up(db: Kysely<any>): Promise<void>;
-    down(db: Kysely<any>): Promise<void>;
+    down?(db: Kysely<any>): Promise<void>;
 }

package/dist/cjs/migration/migration.js

@@ -61,7 +61,7 @@ async function ensureMigrationTableExists(db) {
                 .execute();
         }
         catch (error) {
-            // At least on postgres, `if not exists` doesn't guarantee the `create table`
+            // At least on PostgreSQL, `if not exists` doesn't guarantee the `create table`
             // query doesn't throw if the table already exits. That's why we check if
             // the table exist here and ignore the error if it does.
             if (!(await doesTableExists(db, exports.MIGRATION_TABLE))) {
@@ -81,7 +81,7 @@ async function ensureMigrationLockTableExists(db) {
                 .execute();
         }
         catch (error) {
-            // At least on postgres, `if not exists` doesn't guarantee the `create table`
+            // At least on PostgreSQL, `if not exists` doesn't guarantee the `create table`
             // query doesn't throw if the table already exits. That's why we check if
             // the table exist here and ignore the error if it does.
             if (!(await doesTableExists(db, exports.MIGRATION_LOCK_TABLE))) {
@@ -183,5 +183,5 @@ function ensureMigrationsAreNotCorrupted(executedMigrationNames, oldMigrationNam
     }
 }
 function isMigration(obj) {
-    return (0, object_utils_js_1.isObject)(obj) && (0, object_utils_js_1.isFunction)(obj.up) && (0, object_utils_js_1.isFunction)(obj.down);
+    return (0, object_utils_js_1.isObject)(obj) && (0, object_utils_js_1.isFunction)(obj.up);
 }

package/dist/cjs/operation-node/alias-node.d.ts

@@ -5,7 +5,7 @@ import { RawNode } from './raw-node.js';
 import { ReferenceNode } from './reference-node.js';
 import { SelectQueryNode } from './select-query-node.js';
 import { TableNode } from './table-node.js';
-export declare type AliasNodeChild = ColumnNode | ReferenceNode | TableNode | RawNode | SelectQueryNode;
+export declare type AliasNodeChild = ColumnNode | ReferenceNode | TableNode | SelectQueryNode | RawNode;
 export interface AliasNode extends OperationNode {
     readonly kind: 'AliasNode';
     readonly node: AliasNodeChild;

package/dist/cjs/operation-node/create-view-node.d.ts

@@ -9,6 +9,7 @@ export interface CreateViewNode extends OperationNode {
     readonly name: IdentifierNode;
     readonly materialized?: boolean;
     readonly orReplace?: boolean;
+    readonly ifNotExists?: boolean;
     readonly columns?: ReadonlyArray<ColumnNode>;
     readonly as?: SelectQueryNode | RawNode;
 }

package/dist/cjs/operation-node/having-node.d.ts

@@ -1,18 +1,14 @@
-import { AndNode } from './and-node.js';
-import { FilterNode } from './filter-node.js';
+import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
-import { OrNode } from './or-node.js';
-import { ParensNode } from './parens-node.js';
-export declare type HavingNodeChild = FilterNode | AndNode | OrNode | ParensNode;
 export interface HavingNode extends OperationNode {
     readonly kind: 'HavingNode';
-    readonly having: HavingNodeChild;
+    readonly having: FilterExpressionNode;
 }
 /**
  * @internal
  */
 export declare const HavingNode: Readonly<{
     is(node: OperationNode): node is HavingNode;
-    create(filter: HavingNodeChild): HavingNode;
-    cloneWithFilter(havingNode: HavingNode, op: 'And' | 'Or', having: HavingNodeChild): HavingNode;
+    create(filter: FilterExpressionNode): HavingNode;
+    cloneWithFilter(havingNode: HavingNode, op: 'And' | 'Or', filter: FilterExpressionNode): HavingNode;
 }>;

package/dist/cjs/operation-node/having-node.js

@@ -17,12 +17,12 @@ exports.HavingNode = (0, object_utils_js_1.freeze)({
             having: filter,
         });
     },
-    cloneWithFilter(havingNode, op, having) {
+    cloneWithFilter(havingNode, op, filter) {
         return (0, object_utils_js_1.freeze)({
             ...havingNode,
             having: op === 'And'
-                ? and_node_js_1.AndNode.create(havingNode.having, having)
-                : or_node_js_1.OrNode.create(havingNode.having, having),
+                ? and_node_js_1.AndNode.create(havingNode.having, filter)
+                : or_node_js_1.OrNode.create(havingNode.having, filter),
         });
     },
 });

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

@@ -1,18 +1,15 @@
 import { AliasNode } from './alias-node.js';
-import { AndNode } from './and-node.js';
-import { FilterNode } from './filter-node.js';
+import { OnNode } from './on-node.js';
+import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
-import { OrNode } from './or-node.js';
-import { ParensNode } from './parens-node.js';
 import { TableNode } from './table-node.js';
 export declare type JoinTableNode = TableNode | AliasNode;
 export declare type JoinType = 'InnerJoin' | 'LeftJoin' | 'RightJoin' | 'FullJoin';
-export declare type JoinNodeOnNode = FilterNode | AndNode | OrNode | ParensNode;
 export interface JoinNode extends OperationNode {
     readonly kind: 'JoinNode';
     readonly joinType: JoinType;
     readonly table: JoinTableNode;
-    readonly on?: JoinNodeOnNode;
+    readonly on?: OnNode;
 }
 /**
  * @internal
@@ -20,7 +17,7 @@ export interface JoinNode extends OperationNode {
 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, on: JoinNodeOnNode): JoinNode;
-    cloneWithOrOn(joinNode: JoinNode, on: JoinNodeOnNode): JoinNode;
+    createWithOn(joinType: JoinType, table: JoinTableNode, on: FilterExpressionNode): JoinNode;
+    cloneWithOn(joinNode: JoinNode, filter: FilterExpressionNode): JoinNode;
+    cloneWithOrOn(joinNode: JoinNode, filter: FilterExpressionNode): JoinNode;
 }>;

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinNode = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
-const and_node_js_1 = require("./and-node.js");
-const or_node_js_1 = require("./or-node.js");
+const on_node_js_1 = require("./on-node.js");
 /**
  * @internal
  */
@@ -24,19 +23,23 @@ exports.JoinNode = (0, object_utils_js_1.freeze)({
             kind: 'JoinNode',
             joinType,
             table,
-            on,
+            on: on_node_js_1.OnNode.create(on),
         });
     },
-    cloneWithOn(joinNode, on) {
+    cloneWithOn(joinNode, filter) {
         return (0, object_utils_js_1.freeze)({
             ...joinNode,
-            on: joinNode.on ? and_node_js_1.AndNode.create(joinNode.on, on) : on,
+            on: joinNode.on
+                ? on_node_js_1.OnNode.cloneWithFilter(joinNode.on, 'And', filter)
+                : on_node_js_1.OnNode.create(filter),
         });
     },
-    cloneWithOrOn(joinNode, on) {
+    cloneWithOrOn(joinNode, filter) {
         return (0, object_utils_js_1.freeze)({
             ...joinNode,
-            on: joinNode.on ? or_node_js_1.OrNode.create(joinNode.on, on) : on,
+            on: joinNode.on
+                ? on_node_js_1.OnNode.cloneWithFilter(joinNode.on, 'Or', filter)
+                : on_node_js_1.OnNode.create(filter),
         });
     },
 });

package/dist/cjs/operation-node/on-node.d.ts

@@ -0,0 +1,14 @@
+import { FilterExpressionNode } from './operation-node-utils.js';
+import { OperationNode } from './operation-node.js';
+export interface OnNode extends OperationNode {
+    readonly kind: 'OnNode';
+    readonly on: FilterExpressionNode;
+}
+/**
+ * @internal
+ */
+export declare const OnNode: Readonly<{
+    is(node: OperationNode): node is OnNode;
+    create(filter: FilterExpressionNode): OnNode;
+    cloneWithFilter(onNode: OnNode, op: 'And' | 'Or', filter: FilterExpressionNode): OnNode;
+}>;

package/dist/cjs/operation-node/on-node.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OnNode = void 0;
+const object_utils_js_1 = require("../util/object-utils.js");
+const and_node_js_1 = require("./and-node.js");
+const or_node_js_1 = require("./or-node.js");
+/**
+ * @internal
+ */
+exports.OnNode = (0, object_utils_js_1.freeze)({
+    is(node) {
+        return node.kind === 'OnNode';
+    },
+    create(filter) {
+        return (0, object_utils_js_1.freeze)({
+            kind: 'OnNode',
+            on: filter,
+        });
+    },
+    cloneWithFilter(onNode, op, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...onNode,
+            on: op === 'And'
+                ? and_node_js_1.AndNode.create(onNode.on, filter)
+                : or_node_js_1.OrNode.create(onNode.on, filter),
+        });
+    },
+});

package/dist/cjs/operation-node/operation-node-transformer.d.ts

@@ -62,6 +62,7 @@ import { CreateViewNode } from './create-view-node.js';
 import { DropViewNode } from './drop-view-node.js';
 import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
 import { DefaultValueNode } from './default-value-node.js';
+import { OnNode } from './on-node.js';
 /**
  * Transforms an operation node tree into another one.
  *
@@ -153,6 +154,7 @@ export declare class OperationNodeTransformer {
     protected transformDropView(node: DropViewNode): DropViewNode;
     protected transformGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): GeneratedAlwaysAsNode;
     protected transformDefaultValue(node: DefaultValueNode): DefaultValueNode;
+    protected transformOn(node: OnNode): OnNode;
     protected transformDataType(node: DataTypeNode): DataTypeNode;
     protected transformSelectAll(node: SelectAllNode): SelectAllNode;
     protected transformIdentifier(node: IdentifierNode): IdentifierNode;