kysely 0.10.1 → 0.11.3

package/dist/esm/kysely.js

@@ -151,7 +151,7 @@ export class Kysely extends QueryCreator {
      *   .execute()
      * ```
      *
-     * The generated SQL (postgresql):
+     * The generated SQL (PostgreSQL):
      *
      * ```sql
      * select "person"."id", count("pet"."id") as "pet_count"
@@ -183,17 +183,19 @@ export class Kysely extends 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/esm/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/esm/migration/migration.js

@@ -57,7 +57,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, MIGRATION_TABLE))) {
@@ -77,7 +77,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, MIGRATION_LOCK_TABLE))) {
@@ -179,5 +179,5 @@ function ensureMigrationsAreNotCorrupted(executedMigrationNames, oldMigrationNam
     }
 }
 function isMigration(obj) {
-    return isObject(obj) && isFunction(obj.up) && isFunction(obj.down);
+    return isObject(obj) && isFunction(obj.up);
 }

package/dist/esm/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/esm/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/esm/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/esm/operation-node/having-node.js

@@ -14,12 +14,12 @@ export const HavingNode = freeze({
             having: filter,
         });
     },
-    cloneWithFilter(havingNode, op, having) {
+    cloneWithFilter(havingNode, op, filter) {
         return freeze({
             ...havingNode,
             having: op === 'And'
-                ? AndNode.create(havingNode.having, having)
-                : OrNode.create(havingNode.having, having),
+                ? AndNode.create(havingNode.having, filter)
+                : OrNode.create(havingNode.having, filter),
         });
     },
 });

package/dist/esm/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/esm/operation-node/join-node.js

@@ -1,6 +1,5 @@
 import { freeze } from '../util/object-utils.js';
-import { AndNode } from './and-node.js';
-import { OrNode } from './or-node.js';
+import { OnNode } from './on-node.js';
 /**
  * @internal
  */
@@ -21,19 +20,23 @@ export const JoinNode = freeze({
             kind: 'JoinNode',
             joinType,
             table,
-            on,
+            on: OnNode.create(on),
         });
     },
-    cloneWithOn(joinNode, on) {
+    cloneWithOn(joinNode, filter) {
         return freeze({
             ...joinNode,
-            on: joinNode.on ? AndNode.create(joinNode.on, on) : on,
+            on: joinNode.on
+                ? OnNode.cloneWithFilter(joinNode.on, 'And', filter)
+                : OnNode.create(filter),
         });
     },
-    cloneWithOrOn(joinNode, on) {
+    cloneWithOrOn(joinNode, filter) {
         return freeze({
             ...joinNode,
-            on: joinNode.on ? OrNode.create(joinNode.on, on) : on,
+            on: joinNode.on
+                ? OnNode.cloneWithFilter(joinNode.on, 'Or', filter)
+                : OnNode.create(filter),
         });
     },
 });

package/dist/esm/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/esm/operation-node/on-node.js

@@ -0,0 +1,25 @@
+import { freeze } from '../util/object-utils.js';
+import { AndNode } from './and-node.js';
+import { OrNode } from './or-node.js';
+/**
+ * @internal
+ */
+export const OnNode = freeze({
+    is(node) {
+        return node.kind === 'OnNode';
+    },
+    create(filter) {
+        return freeze({
+            kind: 'OnNode',
+            on: filter,
+        });
+    },
+    cloneWithFilter(onNode, op, filter) {
+        return freeze({
+            ...onNode,
+            on: op === 'And'
+                ? AndNode.create(onNode.on, filter)
+                : OrNode.create(onNode.on, filter),
+        });
+    },
+});

package/dist/esm/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/esm/operation-node/operation-node-transformer.js

@@ -94,6 +94,7 @@ export 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) {
@@ -525,6 +526,7 @@ export 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),
@@ -551,6 +553,12 @@ export 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/esm/operation-node/operation-node-utils.d.ts

@@ -14,4 +14,4 @@ import { ValueNode } from './value-node.js';
 export declare type ReferenceExpressionNode = ColumnNode | ReferenceNode | SelectQueryNode | RawNode;
 export declare type ValueExpressionNode = ValueNode | ValueListNode | PrimitiveValueListNode | ReferenceExpressionNode;
 export declare type TableExpressionNode = TableNode | AliasNode;
-export declare type FilterExpressionNode = FilterNode | AndNode | OrNode | ParensNode;
+export declare type FilterExpressionNode = FilterNode | AndNode | OrNode | ParensNode | RawNode;

package/dist/esm/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/esm/operation-node/operation-node-visitor.js

@@ -1,6 +1,9 @@
 import { freeze } from '../util/object-utils.js';
 export class OperationNodeVisitor {
     nodeStack = [];
+    get parentNode() {
+        return this.nodeStack[this.nodeStack.length - 2];
+    }
     #visitors = freeze({
         AliasNode: this.visitAlias.bind(this),
         ColumnNode: this.visitColumn.bind(this),
@@ -65,6 +68,7 @@ export 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/esm/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/esm/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/esm/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/esm/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/esm/operation-node/where-node.js

@@ -14,12 +14,12 @@ export const WhereNode = freeze({
             where: filter,
         });
     },
-    cloneWithFilter(whereNode, op, where) {
+    cloneWithFilter(whereNode, op, filter) {
         return freeze({
             ...whereNode,
             where: op === 'And'
-                ? AndNode.create(whereNode.where, where)
-                : OrNode.create(whereNode.where, where),
+                ? AndNode.create(whereNode.where, filter)
+                : OrNode.create(whereNode.where, filter),
         });
     },
 });

package/dist/esm/parser/filter-parser.d.ts

@@ -12,3 +12,4 @@ export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExp
 export declare function parseReferenceFilter(ctx: ParseContext, lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
 export declare function parseExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
 export declare function parseNotExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
+export declare function parseFilter(ctx: ParseContext, type: 'where' | 'having' | 'on', args: any[]): FilterExpressionNode;

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

@@ -1,5 +1,5 @@
 import { FilterNode } from '../operation-node/filter-node.js';
-import { isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
+import { freeze, isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
 import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
 import { RawNode } from '../operation-node/raw-node.js';
 import { OperatorNode, OPERATORS, } from '../operation-node/operator-node.js';
@@ -9,37 +9,13 @@ import { parseValueExpressionOrList, } from './value-parser.js';
 import { SelectQueryNode } from '../operation-node/select-query-node.js';
 import { ValueNode } from '../operation-node/value-node.js';
 export function parseWhereFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && isFunction(args[0])) {
-        return parseWhereGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to a where method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'where', args);
 }
 export function parseHavingFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && isFunction(args[0])) {
-        return parseHavingGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to a having method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'having', args);
 }
 export function parseOnFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && isFunction(args[0])) {
-        return parseOnGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to an on method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'on', args);
 }
 export function parseReferenceFilter(ctx, lhs, op, rhs) {
     return FilterNode.create(parseReferenceExpression(ctx, lhs), parseFilterOperator(op), parseReferenceExpression(ctx, rhs));
@@ -50,6 +26,24 @@ export function parseExistFilter(ctx, arg) {
 export function parseNotExistFilter(ctx, arg) {
     return parseExistExpression(ctx, 'not exists', arg);
 }
+export function parseFilter(ctx, type, args) {
+    if (args.length === 3) {
+        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
+    }
+    else if (args.length === 1) {
+        const arg = args[0];
+        if (isFunction(arg)) {
+            return GROUP_PARSERS[type](ctx, arg);
+        }
+        else if (isOperationNodeSource(arg)) {
+            const node = arg.toOperationNode();
+            if (RawNode.is(node)) {
+                return node;
+            }
+        }
+    }
+    throw new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
+}
 function parseThreeArgFilter(ctx, left, op, right) {
     if ((op === 'is' || op === 'is not') && (isNull(right) || isBoolean(right))) {
         return parseIsFilter(ctx, left, op, right);
@@ -70,30 +64,6 @@ function parseFilterOperator(op) {
     }
     throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
 }
-function parseWhereGroup(ctx, callback) {
-    const query = callback(ctx.createSelectQueryBuilder([]));
-    const queryNode = query.toOperationNode();
-    if (!queryNode.where) {
-        throw new Error('no `where*` methods called insided a group callback');
-    }
-    return ParensNode.create(queryNode.where.where);
-}
-function parseHavingGroup(ctx, callback) {
-    const query = callback(ctx.createSelectQueryBuilder([]));
-    const queryNode = query.toOperationNode();
-    if (!queryNode.having) {
-        throw new Error('no `having*` methods called insided a group callback');
-    }
-    return ParensNode.create(queryNode.having.having);
-}
-function parseOnGroup(ctx, callback) {
-    const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
-    const joinNode = joinBuilder.toOperationNode();
-    if (!joinNode.on) {
-        throw new Error('no `on*` methods called insided a group callback');
-    }
-    return ParensNode.create(joinNode.on);
-}
 function parseExistExpression(ctx, type, arg) {
     const node = isFunction(arg)
         ? arg(ctx.createExpressionBuilder()).toOperationNode()
@@ -103,3 +73,29 @@ function parseExistExpression(ctx, type, arg) {
     }
     return FilterNode.create(undefined, OperatorNode.create(type), node);
 }
+const GROUP_PARSERS = freeze({
+    where(ctx, callback) {
+        const query = callback(ctx.createSelectQueryBuilder([]));
+        const queryNode = query.toOperationNode();
+        if (!queryNode.where) {
+            throw new Error('no `where` methods called insided a group callback');
+        }
+        return ParensNode.create(queryNode.where.where);
+    },
+    having(ctx, callback) {
+        const query = callback(ctx.createSelectQueryBuilder([]));
+        const queryNode = query.toOperationNode();
+        if (!queryNode.having) {
+            throw new Error('no `having` methods called insided a group callback');
+        }
+        return ParensNode.create(queryNode.having.having);
+    },
+    on(ctx, callback) {
+        const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
+        const joinNode = joinBuilder.toOperationNode();
+        if (!joinNode.on) {
+            throw new Error('no `on` methods called insided a group callback');
+        }
+        return ParensNode.create(joinNode.on.on);
+    },
+});

package/dist/esm/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/esm/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/esm/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/esm/query-builder/delete-result.d.ts

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

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

@@ -0,0 +1,9 @@
+export class DeleteResult {
+    #numDeletedRows;
+    constructor(numDeletedRows) {
+        this.#numDeletedRows = numDeletedRows;
+    }
+    get numDeletedRows() {
+        return this.#numDeletedRows;
+    }
+}