kysely 0.10.1 → 0.11.0

package/dist/cjs/kysely.d.ts

@@ -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'
      *     })

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/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;

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

@@ -97,6 +97,7 @@ class OperationNodeTransformer {
         DropViewNode: this.transformDropView.bind(this),
         GeneratedAlwaysAsNode: this.transformGeneratedAlwaysAs.bind(this),
         DefaultValueNode: this.transformDefaultValue.bind(this),
+        OnNode: this.transformOn.bind(this),
     });
     transformNode = (node) => {
         if (!node) {
@@ -528,6 +529,7 @@ class OperationNodeTransformer {
             kind: 'CreateViewNode',
             name: this.transformNode(node.name),
             orReplace: node.orReplace,
+            ifNotExists: node.ifNotExists,
             materialized: node.materialized,
             columns: this.transformNodeList(node.columns),
             as: this.transformNode(node.as),
@@ -554,6 +556,12 @@ class OperationNodeTransformer {
             defaultValue: this.transformNode(node.defaultValue),
         };
     }
+    transformOn(node) {
+        return {
+            kind: 'OnNode',
+            on: this.transformNode(node.on),
+        };
+    }
     transformDataType(node) {
         // An Object.freezed leaf node. No need to clone.
         return node;

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

@@ -62,9 +62,11 @@ 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';
 export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
+    protected get parentNode(): OperationNode | undefined;
     protected readonly visitNode: (node: OperationNode) => void;
     protected abstract visitSelectQuery(node: SelectQueryNode): void;
     protected abstract visitSelection(node: SelectionNode): void;
@@ -129,4 +131,5 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitDropView(node: DropViewNode): void;
     protected abstract visitGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): void;
     protected abstract visitDefaultValue(node: DefaultValueNode): void;
+    protected abstract visitOn(node: OnNode): void;
 }

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

@@ -4,6 +4,9 @@ exports.OperationNodeVisitor = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
 class OperationNodeVisitor {
     nodeStack = [];
+    get parentNode() {
+        return this.nodeStack[this.nodeStack.length - 2];
+    }
     #visitors = (0, object_utils_js_1.freeze)({
         AliasNode: this.visitAlias.bind(this),
         ColumnNode: this.visitColumn.bind(this),
@@ -68,6 +71,7 @@ class OperationNodeVisitor {
         DropViewNode: this.visitDropView.bind(this),
         GeneratedAlwaysAsNode: this.visitGeneratedAlwaysAs.bind(this),
         DefaultValueNode: this.visitDefaultValue.bind(this),
+        OnNode: this.visitOn.bind(this),
     });
     visitNode = (node) => {
         this.nodeStack.push(node);

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

@@ -1,4 +1,4 @@
-export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode';
+export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode';
 export interface OperationNode {
     readonly kind: OperationNodeKind;
 }

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

@@ -2,10 +2,10 @@ import { InsertQueryNode } from './insert-query-node.js';
 import { SelectQueryNode } from './select-query-node.js';
 import { UpdateQueryNode } from './update-query-node.js';
 import { DeleteQueryNode } from './delete-query-node.js';
-import { WhereChildNode } from './where-node.js';
 import { JoinNode } from './join-node.js';
 import { SelectionNode } from './selection-node.js';
 import { OperationNode } from './operation-node.js';
+import { FilterExpressionNode } from './operation-node-utils.js';
 export declare type QueryNode = SelectQueryNode | DeleteQueryNode | InsertQueryNode | UpdateQueryNode;
 export declare type MutatingQueryNode = DeleteQueryNode | InsertQueryNode | UpdateQueryNode;
 export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | UpdateQueryNode;
@@ -16,8 +16,8 @@ export declare const QueryNode: Readonly<{
     is(node: OperationNode): node is QueryNode;
     isMutating(node: OperationNode): node is MutatingQueryNode;
     isFilterable(node: OperationNode): node is FilterableQueryNode;
-    cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: WhereChildNode): T;
-    cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: WhereChildNode): T_1;
+    cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: FilterExpressionNode): T;
+    cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: FilterExpressionNode): T_1;
     cloneWithJoin<T_2 extends FilterableQueryNode>(node: T_2, join: JoinNode): T_2;
     cloneWithReturning<T_3 extends MutatingQueryNode>(node: T_3, selections: ReadonlyArray<SelectionNode>): T_3;
 }>;

package/dist/cjs/operation-node/select-query-node.d.ts

@@ -1,12 +1,12 @@
 import { FromNode } from './from-node.js';
 import { GroupByItemNode } from './group-by-item-node.js';
 import { GroupByNode } from './group-by-node.js';
-import { HavingNode, HavingNodeChild } from './having-node.js';
+import { HavingNode } from './having-node.js';
 import { JoinNode } from './join-node.js';
 import { LimitNode } from './limit-node.js';
 import { OffsetNode } from './offset-node.js';
 import { OperationNode } from './operation-node.js';
-import { TableExpressionNode } from './operation-node-utils.js';
+import { FilterExpressionNode, TableExpressionNode } from './operation-node-utils.js';
 import { OrderByItemNode } from './order-by-item-node.js';
 import { OrderByNode } from './order-by-node.js';
 import { SelectionNode } from './selection-node.js';
@@ -44,8 +44,8 @@ export declare const SelectQueryNode: Readonly<{
     cloneWithGroupByItems(selectNode: SelectQueryNode, items: ReadonlyArray<GroupByItemNode>): SelectQueryNode;
     cloneWithLimit(selectNode: SelectQueryNode, limit: LimitNode): SelectQueryNode;
     cloneWithOffset(selectNode: SelectQueryNode, offset: OffsetNode): SelectQueryNode;
-    cloneWithHaving(selectNode: SelectQueryNode, filter: HavingNodeChild): SelectQueryNode;
-    cloneWithOrHaving(selectNode: SelectQueryNode, filter: HavingNodeChild): SelectQueryNode;
+    cloneWithHaving(selectNode: SelectQueryNode, filter: FilterExpressionNode): SelectQueryNode;
+    cloneWithOrHaving(selectNode: SelectQueryNode, filter: FilterExpressionNode): SelectQueryNode;
     cloneWithDistinct(selectNode: SelectQueryNode): SelectQueryNode;
     cloneWithUnion(selectNode: SelectQueryNode, union: UnionNode): SelectQueryNode;
 }>;

package/dist/cjs/operation-node/where-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 WhereChildNode = FilterNode | AndNode | OrNode | ParensNode;
 export interface WhereNode extends OperationNode {
     readonly kind: 'WhereNode';
-    readonly where: WhereChildNode;
+    readonly where: FilterExpressionNode;
 }
 /**
  * @internal
  */
 export declare const WhereNode: Readonly<{
     is(node: OperationNode): node is WhereNode;
-    create(filter: WhereChildNode): WhereNode;
-    cloneWithFilter(whereNode: WhereNode, op: 'And' | 'Or', where: WhereChildNode): WhereNode;
+    create(filter: FilterExpressionNode): WhereNode;
+    cloneWithFilter(whereNode: WhereNode, op: 'And' | 'Or', filter: FilterExpressionNode): WhereNode;
 }>;

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

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

package/dist/cjs/parser/filter-parser.js

@@ -101,7 +101,7 @@ function parseOnGroup(ctx, callback) {
     if (!joinNode.on) {
         throw new Error('no `on*` methods called insided a group callback');
     }
-    return parens_node_js_1.ParensNode.create(joinNode.on);
+    return parens_node_js_1.ParensNode.create(joinNode.on.on);
 }
 function parseExistExpression(ctx, type, arg) {
     const node = (0, object_utils_js_1.isFunction)(arg)

package/dist/cjs/parser/returning-parser.d.ts

@@ -1,7 +1,9 @@
+import { DeleteResult } from '../query-builder/delete-result.js';
+import { InsertResult } from '../query-builder/insert-result.js';
 import { QueryBuilder } from '../query-builder/query-builder.js';
-import { DeleteResultTypeTag, InsertResultTypeTag, UpdateResultTypeTag } from '../util/type-utils.js';
+import { UpdateResult } from '../query-builder/update-result.js';
 import { Selection } from './select-parser.js';
 /**
  * `returning` method output query builder type
  */
-export declare type QueryBuilderWithReturning<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends InsertResultTypeTag ? Selection<DB, TB, S> : O extends DeleteResultTypeTag ? Selection<DB, TB, S> : O extends UpdateResultTypeTag ? Selection<DB, TB, S> : O & Selection<DB, TB, S>>;
+export declare type QueryBuilderWithReturning<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends InsertResult ? Selection<DB, TB, S> : O extends DeleteResult ? Selection<DB, TB, S> : O extends UpdateResult ? Selection<DB, TB, S> : O & Selection<DB, TB, S>>;

package/dist/cjs/parser/select-parser.d.ts

@@ -1,7 +1,7 @@
 import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
 import { AliasedQueryBuilder, QueryBuilder } from '../query-builder/query-builder.js';
 import { SelectionNode } from '../operation-node/selection-node.js';
-import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedColumn, AnyAliasedColumnWithTable, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnyColumn, AnyColumnWithTable, InsertResultTypeTag, RowType, ValueType } from '../util/type-utils.js';
+import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedColumn, AnyAliasedColumnWithTable, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnyColumn, AnyColumnWithTable, RowType, ValueType } from '../util/type-utils.js';
 import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
 import { ParseContext } from './parse-context.js';
 /**
@@ -13,7 +13,7 @@ export declare type SelectExpressionOrList<DB, TB extends keyof DB> = SelectExpr
  * Given a selection expression returns a query builder type that
  * has the selection.
  */
-export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends InsertResultTypeTag ? InsertResultTypeTag : O & Selection<DB, TB, S>>;
+export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O & Selection<DB, TB, S>>;
 /**
  * `selectAll` output query builder type.
  */

package/dist/cjs/plugin/immediate-value.ts/immediate-value-plugin.d.ts

@@ -1,6 +1,6 @@
 import { QueryResult } from '../../driver/database-connection.js';
-import { UnknownRow } from '../../index.js';
 import { RootOperationNode } from '../../query-compiler/query-compiler.js';
+import { UnknownRow } from '../../util/type-utils.js';
 import { KyselyPlugin, PluginTransformQueryArgs, PluginTransformResultArgs } from '../kysely-plugin.js';
 /**
  * Transforms all ValueNodes to immediate.

package/dist/cjs/query-builder/delete-result.d.ts

@@ -0,0 +1,5 @@
+export declare class DeleteResult {
+    #private;
+    constructor(numDeletedRows: bigint);
+    get numDeletedRows(): bigint;
+}

package/dist/cjs/query-builder/delete-result.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeleteResult = void 0;
+class DeleteResult {
+    #numDeletedRows;
+    constructor(numDeletedRows) {
+        this.#numDeletedRows = numDeletedRows;
+    }
+    get numDeletedRows() {
+        return this.#numDeletedRows;
+    }
+}
+exports.DeleteResult = DeleteResult;

package/dist/cjs/query-builder/expression-builder.d.ts

@@ -26,7 +26,7 @@ export declare class ExpressionBuilder<DB, TB extends keyof DB> {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."id", count("pet"."id") as "pet_count"
@@ -62,7 +62,7 @@ export declare class ExpressionBuilder<DB, TB extends keyof DB> {
      * console.log(result[0].owner_name)
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select

package/dist/cjs/query-builder/expression-builder.js

@@ -34,7 +34,7 @@ class ExpressionBuilder {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."id", count("pet"."id") as "pet_count"

package/dist/cjs/query-builder/function-builder.d.ts

@@ -19,7 +19,7 @@ import { RawBuilder } from '../raw-builder/raw-builder.js';
  *   .execute()
  * ```
  *
- * The generated SQL (postgresql):
+ * The generated SQL (PostgreSQL):
  *
  * ```sql
  * select "person"."id", count("pet"."id") as "pet_count"
@@ -66,7 +66,7 @@ export declare class FunctionBuilder<DB, TB extends keyof DB> {
      * Calls the `sum` function for the column given as the argument.
      *
      * If this is used in a `select` statement the type of the selected expression
-     * will be `number | string | BigInt` by default. This is because Kysely can't
+     * will be `number | string | bigint` by default. This is because Kysely can't
      * know the type the db driver outputs. Sometimes the output can be larger than
      * the largest javascript number and a string is returned instead. Most drivers
      * allow you to configure the output type of large numbers and Kysely can't
@@ -83,12 +83,12 @@ export declare class FunctionBuilder<DB, TB extends keyof DB> {
      *   .execute()
      * ```
      */
-    sum<O extends number | string | BigInt, C extends StringReference<DB, TB> = any>(column: C): RawBuilder<O>;
+    sum<O extends number | string | bigint, C extends StringReference<DB, TB> = any>(column: C): RawBuilder<O>;
     /**
      * Calls the `count` function for the column given as the argument.
      *
      * If this is used in a `select` statement the type of the selected expression
-     * will be `number | string | BigInt` by default. This is because Kysely can't
+     * will be `number | string |bigint` by default. This is because Kysely can't
      * know the type the db driver outputs. Sometimes the output can be larger than
      * the largest javascript number and a string is returned instead. Most drivers
      * allow you to configure the output type of large numbers and Kysely can't
@@ -105,7 +105,7 @@ export declare class FunctionBuilder<DB, TB extends keyof DB> {
      *   .execute()
      * ```
      */
-    count<O extends number | string | BigInt, C extends StringReference<DB, TB> = any>(column: C): RawBuilder<O>;
+    count<O extends number | string | bigint, C extends StringReference<DB, TB> = any>(column: C): RawBuilder<O>;
 }
 export interface FunctionBuilderProps {
     readonly executor: QueryExecutor;

package/dist/cjs/query-builder/function-builder.js

@@ -22,7 +22,7 @@ const query_id_js_1 = require("../util/query-id.js");
  *   .execute()
  * ```
  *
- * The generated SQL (postgresql):
+ * The generated SQL (PostgreSQL):
  *
  * ```sql
  * select "person"."id", count("pet"."id") as "pet_count"
@@ -82,7 +82,7 @@ class FunctionBuilder {
      * Calls the `sum` function for the column given as the argument.
      *
      * If this is used in a `select` statement the type of the selected expression
-     * will be `number | string | BigInt` by default. This is because Kysely can't
+     * will be `number | string | bigint` by default. This is because Kysely can't
      * know the type the db driver outputs. Sometimes the output can be larger than
      * the largest javascript number and a string is returned instead. Most drivers
      * allow you to configure the output type of large numbers and Kysely can't
@@ -106,7 +106,7 @@ class FunctionBuilder {
      * Calls the `count` function for the column given as the argument.
      *
      * If this is used in a `select` statement the type of the selected expression
-     * will be `number | string | BigInt` by default. This is because Kysely can't
+     * will be `number | string |bigint` by default. This is because Kysely can't
      * know the type the db driver outputs. Sometimes the output can be larger than
      * the largest javascript number and a string is returned instead. Most drivers
      * allow you to configure the output type of large numbers and Kysely can't