kysely 0.21.6 → 0.22.0

package/dist/cjs/query-compiler/default-query-compiler.js

@@ -4,10 +4,9 @@ exports.DefaultQueryCompiler = void 0;
 const insert_query_node_js_1 = require("../operation-node/insert-query-node.js");
 const operation_node_visitor_js_1 = require("../operation-node/operation-node-visitor.js");
 const query_node_js_1 = require("../operation-node/query-node.js");
-const raw_node_js_1 = require("../operation-node/raw-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
-const union_node_js_1 = require("../operation-node/union-node.js");
 const create_view_node_js_1 = require("../operation-node/create-view-node.js");
+const set_operation_node_js_1 = require("../operation-node/set-operation-node.js");
 class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisitor {
     #sql = '';
     #parameters = [];
@@ -31,7 +30,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         const wrapInParens = this.parentNode !== undefined &&
             !insert_query_node_js_1.InsertQueryNode.is(this.parentNode) &&
             !create_view_node_js_1.CreateViewNode.is(this.parentNode) &&
-            !union_node_js_1.UnionNode.is(this.parentNode);
+            !set_operation_node_js_1.SetOperationNode.is(this.parentNode);
         if (this.parentNode === undefined && node.explain) {
             this.visitNode(node.explain);
             this.append(' ');
@@ -73,9 +72,9 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
             this.visitNode(node.having);
         }
-        if (node.union) {
+        if (node.setOperations) {
             this.append(' ');
-            this.compileList(node.union, ' ');
+            this.compileList(node.setOperations, ' ');
         }
         if (node.orderBy) {
             this.append(' ');
@@ -544,13 +543,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         }
         if (node.expression) {
             this.append(' (');
-            if (raw_node_js_1.RawNode.is(node.expression)) {
-                this.append('(');
-            }
             this.visitNode(node.expression);
-            if (raw_node_js_1.RawNode.is(node.expression)) {
-                this.append(')');
-            }
             this.append(')');
         }
     }
@@ -752,12 +745,13 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' restrict');
         }
     }
-    visitUnion(node) {
-        this.append('union ');
+    visitSetOperation(node) {
+        this.append(node.operator);
+        this.append(' ');
         if (node.all) {
             this.append('all ');
         }
-        this.visitNode(node.union);
+        this.visitNode(node.expression);
     }
     visitCreateView(node) {
         this.append('create ');
@@ -870,6 +864,39 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     visitDefaultInsertValue(_) {
         this.append('default');
     }
+    visitAggregateFunction(node) {
+        this.append(node.func);
+        this.append('(');
+        if (node.distinct) {
+            this.append('distinct ');
+        }
+        this.visitNode(node.column);
+        this.append(')');
+        if (node.over) {
+            this.append(' ');
+            this.visitNode(node.over);
+        }
+    }
+    visitOver(node) {
+        this.append('over(');
+        if (node.partitionBy) {
+            this.visitNode(node.partitionBy);
+            if (node.orderBy) {
+                this.append(' ');
+            }
+        }
+        if (node.orderBy) {
+            this.visitNode(node.orderBy);
+        }
+        this.append(')');
+    }
+    visitPartitionBy(node) {
+        this.append('partition by ');
+        this.compileList(node.items);
+    }
+    visitPartitionByItem(node) {
+        this.visitNode(node.partitionBy);
+    }
     append(str) {
         this.#sql += str;
     }

package/dist/cjs/raw-builder/sql.d.ts

@@ -7,13 +7,14 @@ export interface Sql {
      * import { sql } from 'kysely'
      *
      * const id = 123
-     *
      * const snippet = sql<Person[]>`select * from person where id = ${id}`
      * ```
      *
      * Substitutions (the things inside `${}`) are automatically passed to the database
-     * as parameters and are NOT interpolated to the SQL string. There's no need to worry
-     * about SQL injection vulnerabilities.
+     * as parameters and are never interpolated to the SQL string. There's no need to worry
+     * about SQL injection vulnerabilities. Substitutions can be values, other `sql`
+     * expressions, queries and almost anything else Kysely can produce and they get
+     * handled correctly. See the examples below.
      *
      * If you need your substitutions to be interpreted as identifiers, value literals or
      * lists of things, see the {@link Sql.ref}, {@link Sql.table}, {@link Sql.id},
@@ -29,8 +30,7 @@ export interface Sql {
      *   .selectFrom('person')
      *   .select(
      *     // If you use `sql` in a select statement, remember to call the `as`
-     *     // method to give it an alias. Otherwise Kysely is not able to add
-     *     // the column to the result type.
+     *     // method to give it an alias.
      *     sql<string>`concat(first_name, ' ', last_name)`.as('full_name')
      *   )
      *   .where(sql`birthdate between ${date1} and ${date2}`)
@@ -97,6 +97,14 @@ export interface Sql {
      * type-safety though... But it's possible.
      */
     <T = unknown>(sqlFragments: TemplateStringsArray, ...parameters: unknown[]): RawBuilder<T>;
+    /**
+     * `sql.value(value)` is a shortcut for:
+     *
+     * ```ts
+     * sql`${value}`
+     * ```
+     */
+    value(value: unknown): RawBuilder<unknown>;
     /**
      * This can be used to add runtime column references to SQL snippets.
      *

package/dist/cjs/raw-builder/sql.js

@@ -21,6 +21,12 @@ exports.sql = Object.assign((sqlFragments, ...parameters) => {
             rawNode: raw_node_js_1.RawNode.createWithChild((0, reference_parser_js_1.parseStringReference)(columnReference)),
         });
     },
+    value(value) {
+        return new raw_builder_js_1.RawBuilder({
+            queryId: (0, query_id_js_1.createQueryId)(),
+            rawNode: raw_node_js_1.RawNode.createWithChild((0, value_parser_js_1.parseValueExpression)(value)),
+        });
+    },
     table(tableReference) {
         return new raw_builder_js_1.RawBuilder({
             queryId: (0, query_id_js_1.createQueryId)(),

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

@@ -4,6 +4,7 @@ import { ExpressionBuilder } from '../query-builder/expression-builder.js';
 import { InsertResult } from '../query-builder/insert-result.js';
 import { DeleteResult } from '../query-builder/delete-result.js';
 import { UpdateResult } from '../query-builder/update-result.js';
+import { AggregateFunctionBuilder, AliasedAggregateFunctionBuilder } from '../query-builder/aggregate-function-builder.js';
 /**
  * Given an object type, extracts the union of all value types.
  */
@@ -102,10 +103,13 @@ export declare type AnySelectQueryBuilder = SelectQueryBuilder<any, any, any>;
 export declare type AnyAliasedQueryBuilder = AliasedQueryBuilder<any, any, any, any>;
 export declare type AnyRawBuilder = RawBuilder<any>;
 export declare type AnyAliasedRawBuilder = AliasedRawBuilder<any, any>;
+export declare type AnyAliasedAggregateFunctionBuilder = AliasedAggregateFunctionBuilder<any, any, any, any>;
 export declare type SelectQueryBuilderFactory<DB, TB extends keyof DB> = (qb: ExpressionBuilder<DB, TB>) => AnySelectQueryBuilder;
 export declare type AliasedQueryBuilderFactory<DB, TB extends keyof DB> = (qb: ExpressionBuilder<DB, TB>) => AnyAliasedQueryBuilder;
 export declare type RawBuilderFactory<DB, TB extends keyof DB, O = any> = (qb: ExpressionBuilder<DB, TB>) => RawBuilder<O>;
 export declare type AliasedRawBuilderFactory<DB, TB extends keyof DB> = (qb: ExpressionBuilder<DB, TB>) => AnyAliasedRawBuilder;
+export declare type AggregateFunctionBuilderFactory<DB, TB extends keyof DB, O = unknown> = (qb: ExpressionBuilder<DB, TB>) => AggregateFunctionBuilder<DB, TB, O>;
+export declare type AliasedAggregateFunctionBuilderFactory<DB, TB extends keyof DB> = (qb: ExpressionBuilder<DB, TB>) => AnyAliasedAggregateFunctionBuilder;
 export declare type SingleResultType<O> = O extends InsertResult ? O : O extends DeleteResult ? O : O extends UpdateResult ? O : O | undefined;
 export declare type UnknownRow = Record<string, unknown>;
 export declare type Nullable<T> = {

package/dist/esm/index.d.ts

@@ -10,11 +10,12 @@ export * from './query-builder/delete-query-builder.js';
 export * from './query-builder/no-result-error.js';
 export * from './query-builder/join-builder.js';
 export * from './query-builder/expression-builder.js';
-export * from './query-builder/function-builder.js';
+export * from './query-builder/function-module.js';
 export * from './query-builder/insert-result.js';
 export * from './query-builder/delete-result.js';
 export * from './query-builder/update-result.js';
 export * from './query-builder/on-conflict-builder.js';
+export * from './query-builder/aggregate-function-builder.js';
 export * from './raw-builder/raw-builder.js';
 export * from './raw-builder/sql.js';
 export * from './query-executor/query-executor.js';
@@ -142,7 +143,6 @@ 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';
@@ -152,13 +152,18 @@ export * from './operation-node/where-node.js';
 export * from './operation-node/with-node.js';
 export * from './operation-node/explain-node.js';
 export * from './operation-node/default-insert-value-node.js';
+export * from './operation-node/aggregate-function-node.js';
+export * from './operation-node/over-node.js';
+export * from './operation-node/partition-by-node.js';
+export * from './operation-node/partition-by-item-node.js';
+export * from './operation-node/set-operation-node.js';
 export * from './util/column-type.js';
 export * from './util/compilable.js';
 export * from './util/explainable.js';
 export * from './util/log.js';
 export { AnyColumn, UnknownRow, AnySelectQueryBuilder, } from './util/type-utils.js';
 export { SelectExpression, SelectExpressionOrList, Selection, } from './parser/select-parser.js';
-export { ReferenceExpression, ReferenceExpressionOrList, } from './parser/reference-parser.js';
+export { ReferenceExpression, ReferenceExpressionOrList, StringReference, } from './parser/reference-parser.js';
 export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
 export { FilterValueExpression, FilterValueExpressionOrList, ExistsExpression, FilterOperator, } from './parser/filter-parser.js';
 export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
@@ -166,4 +171,4 @@ export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-
 export { InsertObject } from './parser/insert-values-parser.js';
 export { MutationObject } from './parser/update-set-parser.js';
 export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
-export { UnionExpression } from './parser/union-parser.js';
+export { SetOperationExpression } from './parser/set-operation-parser.js';

package/dist/esm/index.js

@@ -11,11 +11,12 @@ export * from './query-builder/delete-query-builder.js';
 export * from './query-builder/no-result-error.js';
 export * from './query-builder/join-builder.js';
 export * from './query-builder/expression-builder.js';
-export * from './query-builder/function-builder.js';
+export * from './query-builder/function-module.js';
 export * from './query-builder/insert-result.js';
 export * from './query-builder/delete-result.js';
 export * from './query-builder/update-result.js';
 export * from './query-builder/on-conflict-builder.js';
+export * from './query-builder/aggregate-function-builder.js';
 export * from './raw-builder/raw-builder.js';
 export * from './raw-builder/sql.js';
 export * from './query-executor/query-executor.js';
@@ -143,7 +144,6 @@ 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';
@@ -153,6 +153,11 @@ export * from './operation-node/where-node.js';
 export * from './operation-node/with-node.js';
 export * from './operation-node/explain-node.js';
 export * from './operation-node/default-insert-value-node.js';
+export * from './operation-node/aggregate-function-node.js';
+export * from './operation-node/over-node.js';
+export * from './operation-node/partition-by-node.js';
+export * from './operation-node/partition-by-item-node.js';
+export * from './operation-node/set-operation-node.js';
 export * from './util/column-type.js';
 export * from './util/compilable.js';
 export * from './util/explainable.js';

package/dist/esm/kysely.d.ts

@@ -6,7 +6,7 @@ import { QueryCreator } from './query-creator.js';
 import { KyselyPlugin } from './plugin/kysely-plugin.js';
 import { DatabaseIntrospector } from './dialect/database-introspector.js';
 import { Driver, IsolationLevel } from './driver/driver.js';
-import { FunctionBuilder } from './query-builder/function-builder.js';
+import { FunctionModule } from './query-builder/function-module.js';
 import { LogConfig } from './util/log.js';
 import { QueryExecutorProvider } from './query-executor/query-executor-provider.js';
 /**
@@ -72,7 +72,7 @@ export declare class Kysely<DB> extends QueryCreator<DB> implements QueryExecuto
      */
     get introspection(): DatabaseIntrospector;
     /**
-     * Returns a {@link FunctionBuilder} that can be used to write type safe function
+     * Returns a {@link FunctionModule} that can be used to write type safe function
      * calls.
      *
      * ```ts
@@ -99,7 +99,7 @@ export declare class Kysely<DB> extends QueryCreator<DB> implements QueryExecuto
      * having count("pet"."id") > $1
      * ```
      */
-    get fn(): FunctionBuilder<DB, keyof DB>;
+    get fn(): FunctionModule<DB, keyof DB>;
     /**
      * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.
      *

package/dist/esm/kysely.js

@@ -9,7 +9,7 @@ import { RuntimeDriver } from './driver/runtime-driver.js';
 import { SingleConnectionProvider } from './driver/single-connection-provider.js';
 import { TRANSACTION_ISOLATION_LEVELS, } from './driver/driver.js';
 import { preventAwait } from './util/prevent-await.js';
-import { FunctionBuilder } from './query-builder/function-builder.js';
+import { FunctionModule } from './query-builder/function-module.js';
 import { Log } from './util/log.js';
 /**
  * The main Kysely class.
@@ -105,7 +105,7 @@ export class Kysely extends QueryCreator {
         return this.#props.dialect.createIntrospector(this.withoutPlugins());
     }
     /**
-     * Returns a {@link FunctionBuilder} that can be used to write type safe function
+     * Returns a {@link FunctionModule} that can be used to write type safe function
      * calls.
      *
      * ```ts
@@ -133,7 +133,7 @@ export class Kysely extends QueryCreator {
      * ```
      */
     get fn() {
-        return new FunctionBuilder();
+        return new FunctionModule();
     }
     /**
      * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.

package/dist/esm/migration/file-migration-provider.js

@@ -29,8 +29,13 @@ export class FileMigrationProvider {
                 !fileName.endsWith('.d.ts')) {
                 const migration = await import(
                 /* webpackIgnore: true */ this.#props.path.join(this.#props.migrationFolder, fileName));
-                if (isMigration(migration)) {
-                    migrations[fileName.substring(0, fileName.length - 3)] = migration;
+                const migrationKey = fileName.substring(0, fileName.length - 3);
+                // Handle esModuleInterop export's `default` prop...
+                if (isMigration(migration?.default)) {
+                    migrations[migrationKey] = migration.default;
+                }
+                else if (isMigration(migration)) {
+                    migrations[migrationKey] = migration;
                 }
             }
         }

package/dist/esm/operation-node/aggregate-function-node.d.ts

@@ -0,0 +1,22 @@
+import { ColumnNode } from './column-node.js';
+import { OperationNode } from './operation-node.js';
+import { OverNode } from './over-node.js';
+import { ReferenceNode } from './reference-node.js';
+declare type AggregateFunction = 'avg' | 'count' | 'max' | 'min' | 'sum';
+export interface AggregateFunctionNode extends OperationNode {
+    readonly kind: 'AggregateFunctionNode';
+    readonly func: AggregateFunction;
+    readonly column: ColumnNode | ReferenceNode;
+    readonly distinct?: boolean;
+    readonly over?: OverNode;
+}
+/**
+ * @internal
+ */
+export declare const AggregateFunctionNode: Readonly<{
+    is(node: OperationNode): node is AggregateFunctionNode;
+    create(aggregateFunction: AggregateFunction, column: ColumnNode | ReferenceNode): AggregateFunctionNode;
+    cloneWithDistinct(aggregateFunctionNode: AggregateFunctionNode): AggregateFunctionNode;
+    cloneWithOver(aggregateFunctionNode: AggregateFunctionNode, over?: OverNode): AggregateFunctionNode;
+}>;
+export {};

package/dist/esm/operation-node/aggregate-function-node.js

@@ -0,0 +1,29 @@
+/// <reference types="./aggregate-function-node.d.ts" />
+import { freeze } from '../util/object-utils.js';
+/**
+ * @internal
+ */
+export const AggregateFunctionNode = freeze({
+    is(node) {
+        return node.kind === 'AggregateFunctionNode';
+    },
+    create(aggregateFunction, column) {
+        return freeze({
+            kind: 'AggregateFunctionNode',
+            func: aggregateFunction,
+            column,
+        });
+    },
+    cloneWithDistinct(aggregateFunctionNode) {
+        return freeze({
+            ...aggregateFunctionNode,
+            distinct: true,
+        });
+    },
+    cloneWithOver(aggregateFunctionNode, over) {
+        return freeze({
+            ...aggregateFunctionNode,
+            over,
+        });
+    },
+});

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

@@ -1,3 +1,4 @@
+import { AggregateFunctionNode } from './aggregate-function-node.js';
 import { ColumnNode } from './column-node.js';
 import { IdentifierNode } from './identifier-node.js';
 import { OperationNode } from './operation-node.js';
@@ -5,7 +6,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 | SelectQueryNode | RawNode;
+export declare type AliasNodeChild = ColumnNode | ReferenceNode | TableNode | SelectQueryNode | RawNode | AggregateFunctionNode;
 export interface AliasNode extends OperationNode {
     readonly kind: 'AliasNode';
     readonly node: AliasNodeChild;

package/dist/esm/operation-node/group-by-node.d.ts

@@ -10,5 +10,5 @@ export interface GroupByNode extends OperationNode {
 export declare const GroupByNode: Readonly<{
     is(node: OperationNode): node is GroupByNode;
     create(items: ReadonlyArray<GroupByItemNode>): GroupByNode;
-    cloneWithItems(orderBy: GroupByNode, items: ReadonlyArray<GroupByItemNode>): GroupByNode;
+    cloneWithItems(groupBy: GroupByNode, items: ReadonlyArray<GroupByItemNode>): GroupByNode;
 }>;

package/dist/esm/operation-node/group-by-node.js

@@ -13,10 +13,10 @@ export const GroupByNode = freeze({
             items: freeze(items),
         });
     },
-    cloneWithItems(orderBy, items) {
+    cloneWithItems(groupBy, items) {
         return freeze({
-            ...orderBy,
-            items: freeze([...orderBy.items, ...items]),
+            ...groupBy,
+            items: freeze([...groupBy.items, ...items]),
         });
     },
 });

package/dist/esm/operation-node/insert-query-node.d.ts

@@ -1,3 +1,4 @@
+import { AggregateFunctionNode } from './aggregate-function-node.js';
 import { ColumnNode } from './column-node.js';
 import { ExplainNode } from './explain-node.js';
 import { OnConflictNode } from './on-conflict-node.js';
@@ -14,7 +15,7 @@ export interface InsertQueryNode extends OperationNode {
     readonly kind: 'InsertQueryNode';
     readonly into: TableNode;
     readonly columns?: ReadonlyArray<ColumnNode>;
-    readonly values?: ValuesNode | SelectQueryNode | RawNode;
+    readonly values?: ValuesNode | SelectQueryNode | RawNode | AggregateFunctionNode;
     readonly returning?: ReturningNode;
     readonly onConflict?: OnConflictNode;
     readonly onDuplicateKey?: OnDuplicateKeyNode;

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

@@ -58,7 +58,6 @@ import { ForeignKeyConstraintNode } from './foreign-key-constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
 import { ModifyColumnNode } from './modify-column-node.js';
 import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
-import { UnionNode } from './union-node.js';
 import { CreateViewNode } from './create-view-node.js';
 import { DropViewNode } from './drop-view-node.js';
 import { GeneratedNode } from './generated-node.js';
@@ -71,6 +70,11 @@ import { DropTypeNode } from './drop-type-node.js';
 import { ExplainNode } from './explain-node.js';
 import { SchemableIdentifierNode } from './schemable-identifier-node.js';
 import { DefaultInsertValueNode } from './default-insert-value-node.js';
+import { AggregateFunctionNode } from './aggregate-function-node.js';
+import { OverNode } from './over-node.js';
+import { PartitionByNode } from './partition-by-node.js';
+import { PartitionByItemNode } from './partition-by-item-node.js';
+import { SetOperationNode } from './set-operation-node.js';
 /**
  * Transforms an operation node tree into another one.
  *
@@ -145,7 +149,7 @@ export declare class OperationNodeTransformer {
     protected transformPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): PrimaryKeyConstraintNode;
     protected transformUniqueConstraint(node: UniqueConstraintNode): UniqueConstraintNode;
     protected transformForeignKeyConstraint(node: ForeignKeyConstraintNode): ForeignKeyConstraintNode;
-    protected transformUnion(node: UnionNode): UnionNode;
+    protected transformSetOperation(node: SetOperationNode): SetOperationNode;
     protected transformReferences(node: ReferencesNode): ReferencesNode;
     protected transformCheckConstraint(node: CheckConstraintNode): CheckConstraintNode;
     protected transformWith(node: WithNode): WithNode;
@@ -171,6 +175,10 @@ export declare class OperationNodeTransformer {
     protected transformDropType(node: DropTypeNode): DropTypeNode;
     protected transformExplain(node: ExplainNode): ExplainNode;
     protected transformSchemableIdentifier(node: SchemableIdentifierNode): SchemableIdentifierNode;
+    protected transformAggregateFunction(node: AggregateFunctionNode): AggregateFunctionNode;
+    protected transformOver(node: OverNode): OverNode;
+    protected transformPartitionBy(node: PartitionByNode): PartitionByNode;
+    protected transformPartitionByItem(node: PartitionByItemNode): PartitionByItemNode;
     protected transformDataType(node: DataTypeNode): DataTypeNode;
     protected transformSelectAll(node: SelectAllNode): SelectAllNode;
     protected transformIdentifier(node: IdentifierNode): IdentifierNode;

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

@@ -93,7 +93,6 @@ export class OperationNodeTransformer {
         AddConstraintNode: this.transformAddConstraint.bind(this),
         DropConstraintNode: this.transformDropConstraint.bind(this),
         ForeignKeyConstraintNode: this.transformForeignKeyConstraint.bind(this),
-        UnionNode: this.transformUnion.bind(this),
         CreateViewNode: this.transformCreateView.bind(this),
         DropViewNode: this.transformDropView.bind(this),
         GeneratedNode: this.transformGenerated.bind(this),
@@ -105,6 +104,11 @@ export class OperationNodeTransformer {
         DropTypeNode: this.transformDropType.bind(this),
         ExplainNode: this.transformExplain.bind(this),
         DefaultInsertValueNode: this.transformDefaultInsertValue.bind(this),
+        AggregateFunctionNode: this.transformAggregateFunction.bind(this),
+        OverNode: this.transformOver.bind(this),
+        PartitionByNode: this.transformPartitionBy.bind(this),
+        PartitionByItemNode: this.transformPartitionByItem.bind(this),
+        SetOperationNode: this.transformSetOperation.bind(this),
     });
     transformNode(node) {
         if (!node) {
@@ -140,8 +144,8 @@ export class OperationNodeTransformer {
             offset: this.transformNode(node.offset),
             with: this.transformNode(node.with),
             having: this.transformNode(node.having),
-            union: this.transformNodeList(node.union),
             explain: this.transformNode(node.explain),
+            setOperations: this.transformNodeList(node.setOperations),
         });
     }
     transformSelection(node) {
@@ -444,10 +448,11 @@ export class OperationNodeTransformer {
             onUpdate: node.onUpdate,
         });
     }
-    transformUnion(node) {
+    transformSetOperation(node) {
         return requireAllProps({
-            kind: 'UnionNode',
-            union: this.transformNode(node.union),
+            kind: 'SetOperationNode',
+            operator: node.operator,
+            expression: this.transformNode(node.expression),
             all: node.all,
         });
     }
@@ -647,6 +652,34 @@ export class OperationNodeTransformer {
             identifier: this.transformNode(node.identifier),
         });
     }
+    transformAggregateFunction(node) {
+        return requireAllProps({
+            kind: 'AggregateFunctionNode',
+            column: this.transformNode(node.column),
+            distinct: node.distinct,
+            func: node.func,
+            over: this.transformNode(node.over),
+        });
+    }
+    transformOver(node) {
+        return requireAllProps({
+            kind: 'OverNode',
+            orderBy: this.transformNode(node.orderBy),
+            partitionBy: this.transformNode(node.partitionBy),
+        });
+    }
+    transformPartitionBy(node) {
+        return requireAllProps({
+            kind: 'PartitionByNode',
+            items: this.transformNodeList(node.items),
+        });
+    }
+    transformPartitionByItem(node) {
+        return requireAllProps({
+            kind: 'PartitionByItemNode',
+            partitionBy: this.transformNode(node.partitionBy),
+        });
+    }
     transformDataType(node) {
         // An Object.freezed leaf node. No need to clone.
         return node;

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

@@ -1,3 +1,4 @@
+import { AggregateFunctionNode } from './aggregate-function-node.js';
 import { AliasNode } from './alias-node.js';
 import { AndNode } from './and-node.js';
 import { ColumnNode } from './column-node.js';
@@ -11,7 +12,7 @@ import { SelectQueryNode } from './select-query-node.js';
 import { TableNode } from './table-node.js';
 import { ValueListNode } from './value-list-node.js';
 import { ValueNode } from './value-node.js';
-export declare type ReferenceExpressionNode = ColumnNode | ReferenceNode | SelectQueryNode | RawNode;
+export declare type ReferenceExpressionNode = ColumnNode | ReferenceNode | SelectQueryNode | RawNode | AggregateFunctionNode;
 export declare type ValueExpressionNode = ValueNode | ValueListNode | PrimitiveValueListNode | ReferenceExpressionNode;
 export declare type TableExpressionNode = TableNode | AliasNode;
 export declare type FilterExpressionNode = FilterNode | AndNode | OrNode | ParensNode | RawNode;

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

@@ -58,7 +58,6 @@ import { ForeignKeyConstraintNode } from './foreign-key-constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
 import { ModifyColumnNode } from './modify-column-node.js';
 import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
-import { UnionNode } from './union-node.js';
 import { CreateViewNode } from './create-view-node.js';
 import { DropViewNode } from './drop-view-node.js';
 import { GeneratedNode } from './generated-node.js';
@@ -71,6 +70,11 @@ import { DropTypeNode } from './drop-type-node.js';
 import { ExplainNode } from './explain-node.js';
 import { SchemableIdentifierNode } from './schemable-identifier-node.js';
 import { DefaultInsertValueNode } from './default-insert-value-node.js';
+import { AggregateFunctionNode } from './aggregate-function-node.js';
+import { OverNode } from './over-node.js';
+import { PartitionByNode } from './partition-by-node.js';
+import { PartitionByItemNode } from './partition-by-item-node.js';
+import { SetOperationNode } from './set-operation-node.js';
 export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
@@ -129,7 +133,6 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitAddConstraint(node: AddConstraintNode): void;
     protected abstract visitDropConstraint(node: DropConstraintNode): void;
     protected abstract visitForeignKeyConstraint(node: ForeignKeyConstraintNode): void;
-    protected abstract visitUnion(node: UnionNode): void;
     protected abstract visitDataType(node: DataTypeNode): void;
     protected abstract visitSelectAll(node: SelectAllNode): void;
     protected abstract visitIdentifier(node: IdentifierNode): void;
@@ -148,4 +151,9 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitDropType(node: DropTypeNode): void;
     protected abstract visitExplain(node: ExplainNode): void;
     protected abstract visitDefaultInsertValue(node: DefaultInsertValueNode): void;
+    protected abstract visitAggregateFunction(node: AggregateFunctionNode): void;
+    protected abstract visitOver(node: OverNode): void;
+    protected abstract visitPartitionBy(node: PartitionByNode): void;
+    protected abstract visitPartitionByItem(node: PartitionByItemNode): void;
+    protected abstract visitSetOperation(node: SetOperationNode): void;
 }

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

@@ -66,7 +66,6 @@ export class OperationNodeVisitor {
         AddConstraintNode: this.visitAddConstraint.bind(this),
         DropConstraintNode: this.visitDropConstraint.bind(this),
         ForeignKeyConstraintNode: this.visitForeignKeyConstraint.bind(this),
-        UnionNode: this.visitUnion.bind(this),
         CreateViewNode: this.visitCreateView.bind(this),
         DropViewNode: this.visitDropView.bind(this),
         GeneratedNode: this.visitGenerated.bind(this),
@@ -78,6 +77,11 @@ export class OperationNodeVisitor {
         DropTypeNode: this.visitDropType.bind(this),
         ExplainNode: this.visitExplain.bind(this),
         DefaultInsertValueNode: this.visitDefaultInsertValue.bind(this),
+        AggregateFunctionNode: this.visitAggregateFunction.bind(this),
+        OverNode: this.visitOver.bind(this),
+        PartitionByNode: this.visitPartitionBy.bind(this),
+        PartitionByItemNode: this.visitPartitionByItem.bind(this),
+        SetOperationNode: this.visitSetOperation.bind(this),
     });
     visitNode = (node) => {
         this.nodeStack.push(node);