kysely 0.22.0 → 0.23.0

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

@@ -21,36 +21,36 @@ exports.OnConflictNode = (0, object_utils_js_1.freeze)({
             ...props,
         });
     },
-    cloneWithIndexWhere(node, filter) {
+    cloneWithIndexWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             indexWhere: node.indexWhere
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.indexWhere, 'And', filter)
-                : where_node_js_1.WhereNode.create(filter),
+                ? where_node_js_1.WhereNode.cloneWithOperation(node.indexWhere, 'And', operation)
+                : where_node_js_1.WhereNode.create(operation),
         });
     },
-    cloneWithIndexOrWhere(node, filter) {
+    cloneWithIndexOrWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             indexWhere: node.indexWhere
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.indexWhere, 'Or', filter)
-                : where_node_js_1.WhereNode.create(filter),
+                ? where_node_js_1.WhereNode.cloneWithOperation(node.indexWhere, 'Or', operation)
+                : where_node_js_1.WhereNode.create(operation),
         });
     },
-    cloneWithUpdateWhere(node, filter) {
+    cloneWithUpdateWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             updateWhere: node.updateWhere
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.updateWhere, 'And', filter)
-                : where_node_js_1.WhereNode.create(filter),
+                ? where_node_js_1.WhereNode.cloneWithOperation(node.updateWhere, 'And', operation)
+                : where_node_js_1.WhereNode.create(operation),
         });
     },
-    cloneWithUpdateOrWhere(node, filter) {
+    cloneWithUpdateOrWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             updateWhere: node.updateWhere
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.updateWhere, 'Or', filter)
-                : where_node_js_1.WhereNode.create(filter),
+                ? where_node_js_1.WhereNode.cloneWithOperation(node.updateWhere, 'Or', operation)
+                : where_node_js_1.WhereNode.create(operation),
         });
     },
 });

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

@@ -1,14 +1,13 @@
-import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
 export interface OnNode extends OperationNode {
     readonly kind: 'OnNode';
-    readonly on: FilterExpressionNode;
+    readonly on: OperationNode;
 }
 /**
  * @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;
+    create(filter: OperationNode): OnNode;
+    cloneWithOperation(onNode: OnNode, operator: 'And' | 'Or', operation: OperationNode): OnNode;
 }>;

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

@@ -17,12 +17,12 @@ exports.OnNode = (0, object_utils_js_1.freeze)({
             on: filter,
         });
     },
-    cloneWithFilter(onNode, op, filter) {
+    cloneWithOperation(onNode, operator, operation) {
         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),
+            on: operator === 'And'
+                ? and_node_js_1.AndNode.create(onNode.on, operation)
+                : or_node_js_1.OrNode.create(onNode.on, operation),
         });
     },
 });

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

@@ -15,7 +15,6 @@ import { RawNode } from './raw-node.js';
 import { SelectQueryNode } from './select-query-node.js';
 import { ValueListNode } from './value-list-node.js';
 import { ValueNode } from './value-node.js';
-import { FilterNode } from './filter-node.js';
 import { OperatorNode } from './operator-node.js';
 import { FromNode } from './from-node.js';
 import { WhereNode } from './where-node.js';
@@ -75,6 +74,8 @@ 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';
+import { BinaryOperationNode } from './binary-operation-node.js';
+import { UnaryOperationNode } from './unary-operation-node.js';
 /**
  * Transforms an operation node tree into another one.
  *
@@ -117,7 +118,6 @@ export declare class OperationNodeTransformer {
     protected transformTable(node: TableNode): TableNode;
     protected transformFrom(node: FromNode): FromNode;
     protected transformReference(node: ReferenceNode): ReferenceNode;
-    protected transformFilter(node: FilterNode): FilterNode;
     protected transformAnd(node: AndNode): AndNode;
     protected transformOr(node: OrNode): OrNode;
     protected transformValueList(node: ValueListNode): ValueListNode;
@@ -179,6 +179,8 @@ export declare class OperationNodeTransformer {
     protected transformOver(node: OverNode): OverNode;
     protected transformPartitionBy(node: PartitionByNode): PartitionByNode;
     protected transformPartitionByItem(node: PartitionByItemNode): PartitionByItemNode;
+    protected transformBinaryOperation(node: BinaryOperationNode): BinaryOperationNode;
+    protected transformUnaryOperation(node: UnaryOperationNode): UnaryOperationNode;
     protected transformDataType(node: DataTypeNode): DataTypeNode;
     protected transformSelectAll(node: SelectAllNode): SelectAllNode;
     protected transformIdentifier(node: IdentifierNode): IdentifierNode;

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

@@ -46,7 +46,6 @@ class OperationNodeTransformer {
         TableNode: this.transformTable.bind(this),
         FromNode: this.transformFrom.bind(this),
         SelectAllNode: this.transformSelectAll.bind(this),
-        FilterNode: this.transformFilter.bind(this),
         AndNode: this.transformAnd.bind(this),
         OrNode: this.transformOr.bind(this),
         ValueNode: this.transformValue.bind(this),
@@ -111,6 +110,8 @@ class OperationNodeTransformer {
         PartitionByNode: this.transformPartitionBy.bind(this),
         PartitionByItemNode: this.transformPartitionByItem.bind(this),
         SetOperationNode: this.transformSetOperation.bind(this),
+        BinaryOperationNode: this.transformBinaryOperation.bind(this),
+        UnaryOperationNode: this.transformUnaryOperation.bind(this),
     });
     transformNode(node) {
         if (!node) {
@@ -135,7 +136,7 @@ class OperationNodeTransformer {
             kind: 'SelectQueryNode',
             from: this.transformNode(node.from),
             selections: this.transformNodeList(node.selections),
-            distinctOnSelections: this.transformNodeList(node.distinctOnSelections),
+            distinctOn: this.transformNodeList(node.distinctOn),
             joins: this.transformNodeList(node.joins),
             groupBy: this.transformNode(node.groupBy),
             orderBy: this.transformNode(node.orderBy),
@@ -188,14 +189,6 @@ class OperationNodeTransformer {
             column: this.transformNode(node.column),
         });
     }
-    transformFilter(node) {
-        return (0, require_all_props_js_1.requireAllProps)({
-            kind: 'FilterNode',
-            left: this.transformNode(node.left),
-            op: this.transformNode(node.op),
-            right: this.transformNode(node.right),
-        });
-    }
     transformAnd(node) {
         return (0, require_all_props_js_1.requireAllProps)({
             kind: 'AndNode',
@@ -310,6 +303,8 @@ class OperationNodeTransformer {
             defaultTo: this.transformNode(node.defaultTo),
             check: this.transformNode(node.check),
             generated: this.transformNode(node.generated),
+            frontModifiers: this.transformNodeList(node.frontModifiers),
+            endModifiers: this.transformNodeList(node.endModifiers),
         });
     }
     transformAddColumn(node) {
@@ -522,11 +517,7 @@ class OperationNodeTransformer {
             table: this.transformNode(node.table),
             renameTo: this.transformNode(node.renameTo),
             setSchema: this.transformNode(node.setSchema),
-            renameColumn: this.transformNode(node.renameColumn),
-            addColumn: this.transformNode(node.addColumn),
-            dropColumn: this.transformNode(node.dropColumn),
-            alterColumn: this.transformNode(node.alterColumn),
-            modifyColumn: this.transformNode(node.modifyColumn),
+            columnAlterations: this.transformNodeList(node.columnAlterations),
             addConstraint: this.transformNode(node.addConstraint),
             dropConstraint: this.transformNode(node.dropConstraint),
         });
@@ -659,6 +650,7 @@ class OperationNodeTransformer {
             kind: 'AggregateFunctionNode',
             column: this.transformNode(node.column),
             distinct: node.distinct,
+            filter: this.transformNode(node.filter),
             func: node.func,
             over: this.transformNode(node.over),
         });
@@ -682,6 +674,21 @@ class OperationNodeTransformer {
             partitionBy: this.transformNode(node.partitionBy),
         });
     }
+    transformBinaryOperation(node) {
+        return (0, require_all_props_js_1.requireAllProps)({
+            kind: 'BinaryOperationNode',
+            leftOperand: this.transformNode(node.leftOperand),
+            operator: this.transformNode(node.operator),
+            rightOperand: this.transformNode(node.rightOperand),
+        });
+    }
+    transformUnaryOperation(node) {
+        return (0, require_all_props_js_1.requireAllProps)({
+            kind: 'UnaryOperationNode',
+            operator: this.transformNode(node.operator),
+            operand: this.transformNode(node.operand),
+        });
+    }
     transformDataType(node) {
         // An Object.freezed leaf node. No need to clone.
         return node;

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

@@ -15,7 +15,6 @@ import { RawNode } from './raw-node.js';
 import { SelectQueryNode } from './select-query-node.js';
 import { ValueListNode } from './value-list-node.js';
 import { ValueNode } from './value-node.js';
-import { FilterNode } from './filter-node.js';
 import { OperatorNode } from './operator-node.js';
 import { FromNode } from './from-node.js';
 import { WhereNode } from './where-node.js';
@@ -75,6 +74,8 @@ 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';
+import { BinaryOperationNode } from './binary-operation-node.js';
+import { UnaryOperationNode } from './unary-operation-node.js';
 export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
@@ -87,7 +88,6 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitTable(node: TableNode): void;
     protected abstract visitFrom(node: FromNode): void;
     protected abstract visitReference(node: ReferenceNode): void;
-    protected abstract visitFilter(node: FilterNode): void;
     protected abstract visitAnd(node: AndNode): void;
     protected abstract visitOr(node: OrNode): void;
     protected abstract visitValueList(node: ValueListNode): void;
@@ -156,4 +156,6 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitPartitionBy(node: PartitionByNode): void;
     protected abstract visitPartitionByItem(node: PartitionByItemNode): void;
     protected abstract visitSetOperation(node: SetOperationNode): void;
+    protected abstract visitBinaryOperation(node: BinaryOperationNode): void;
+    protected abstract visitUnaryOperation(node: UnaryOperationNode): void;
 }

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

@@ -19,7 +19,6 @@ class OperationNodeVisitor {
         TableNode: this.visitTable.bind(this),
         FromNode: this.visitFrom.bind(this),
         SelectAllNode: this.visitSelectAll.bind(this),
-        FilterNode: this.visitFilter.bind(this),
         AndNode: this.visitAnd.bind(this),
         OrNode: this.visitOr.bind(this),
         ValueNode: this.visitValue.bind(this),
@@ -84,6 +83,8 @@ class OperationNodeVisitor {
         PartitionByNode: this.visitPartitionBy.bind(this),
         PartitionByItemNode: this.visitPartitionByItem.bind(this),
         SetOperationNode: this.visitSetOperation.bind(this),
+        BinaryOperationNode: this.visitBinaryOperation.bind(this),
+        UnaryOperationNode: this.visitUnaryOperation.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' | 'SchemableIdentifierNode' | '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' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode' | 'SelectModifierNode' | 'CreateTypeNode' | 'DropTypeNode' | 'ExplainNode' | 'DefaultInsertValueNode' | 'AggregateFunctionNode' | 'OverNode' | 'PartitionByNode' | 'PartitionByItemNode' | 'SetOperationNode';
+export declare type OperationNodeKind = 'IdentifierNode' | 'SchemableIdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | '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' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode' | 'SelectModifierNode' | 'CreateTypeNode' | 'DropTypeNode' | 'ExplainNode' | 'DefaultInsertValueNode' | 'AggregateFunctionNode' | 'OverNode' | 'PartitionByNode' | 'PartitionByItemNode' | 'SetOperationNode' | 'BinaryOperationNode' | 'UnaryOperationNode';
 export interface OperationNode {
     readonly kind: OperationNodeKind;
 }

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

@@ -1,7 +1,9 @@
-import { ArrayItemType } from '../util/type-utils.js';
 import { OperationNode } from './operation-node.js';
-export declare const OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "ilike", "not ilike", "@>", "<@", "?", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "exists", "not exists", "&&", "||", "@@", "@@@", "!!", "<->"];
-export declare type Operator = ArrayItemType<typeof OPERATORS>;
+export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "&&", "||", "@@", "@@@", "!!", "<->"];
+export declare const UNARY_FILTER_OPERATORS: readonly ["exists", "not exists"];
+export declare type ComparisonOperator = typeof COMPARISON_OPERATORS[number];
+export declare type UnaryFilterOperator = typeof UNARY_FILTER_OPERATORS[number];
+export declare type Operator = ComparisonOperator | UnaryFilterOperator;
 export interface OperatorNode extends OperationNode {
     readonly kind: 'OperatorNode';
     readonly operator: Operator;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OperatorNode = exports.OPERATORS = void 0;
+exports.OperatorNode = exports.UNARY_FILTER_OPERATORS = exports.COMPARISON_OPERATORS = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
-exports.OPERATORS = [
+exports.COMPARISON_OPERATORS = [
     '=',
     '==',
     '!=',
@@ -22,7 +22,6 @@ exports.OPERATORS = [
     '@>',
     '<@',
     '?',
-    '?',
     '?&',
     '!<',
     '!>',
@@ -31,8 +30,6 @@ exports.OPERATORS = [
     '~',
     '~*',
     '!~*',
-    'exists',
-    'not exists',
     '&&',
     '||',
     '@@',
@@ -40,6 +37,7 @@ exports.OPERATORS = [
     '!!',
     '<->',
 ];
+exports.UNARY_FILTER_OPERATORS = ['exists', 'not exists'];
 /**
  * @internal
  */

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

@@ -1,14 +1,13 @@
 import { OperationNode } from './operation-node.js';
-import { FilterExpressionNode } from './operation-node-utils.js';
 export interface OrNode extends OperationNode {
     readonly kind: 'OrNode';
-    readonly left: FilterExpressionNode;
-    readonly right: FilterExpressionNode;
+    readonly left: OperationNode;
+    readonly right: OperationNode;
 }
 /**
  * @internal
  */
 export declare const OrNode: Readonly<{
     is(node: OperationNode): node is OrNode;
-    create(left: FilterExpressionNode, right: FilterExpressionNode): OrNode;
+    create(left: OperationNode, right: OperationNode): OrNode;
 }>;

package/dist/cjs/operation-node/order-by-item-node.d.ts

@@ -1,15 +1,13 @@
 import { OperationNode } from './operation-node.js';
-import { ReferenceExpressionNode } from './operation-node-utils.js';
-import { RawNode } from './raw-node.js';
 export interface OrderByItemNode extends OperationNode {
     readonly kind: 'OrderByItemNode';
-    readonly orderBy: ReferenceExpressionNode;
-    readonly direction?: RawNode;
+    readonly orderBy: OperationNode;
+    readonly direction?: OperationNode;
 }
 /**
  * @internal
  */
 export declare const OrderByItemNode: Readonly<{
     is(node: OperationNode): node is OrderByItemNode;
-    create(orderBy: ReferenceExpressionNode, direction?: RawNode): OrderByItemNode;
+    create(orderBy: OperationNode, direction?: OperationNode): OrderByItemNode;
 }>;

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

@@ -1,13 +1,12 @@
 import { OperationNode } from './operation-node.js';
-import { FilterExpressionNode } from './operation-node-utils.js';
 export interface ParensNode extends OperationNode {
     readonly kind: 'ParensNode';
-    readonly node: FilterExpressionNode;
+    readonly node: OperationNode;
 }
 /**
  * @internal
  */
 export declare const ParensNode: Readonly<{
     is(node: OperationNode): node is ParensNode;
-    create(node: FilterExpressionNode): ParensNode;
+    create(node: OperationNode): ParensNode;
 }>;

package/dist/cjs/operation-node/partition-by-item-node.d.ts

@@ -1,14 +1,13 @@
-import { ColumnNode } from './column-node.js';
 import { OperationNode } from './operation-node.js';
-import { ReferenceNode } from './reference-node.js';
+import { SimpleReferenceExpressionNode } from './simple-reference-expression-node.js';
 export interface PartitionByItemNode extends OperationNode {
     readonly kind: 'PartitionByItemNode';
-    readonly partitionBy: ColumnNode | ReferenceNode;
+    readonly partitionBy: SimpleReferenceExpressionNode;
 }
 /**
  * @internal
  */
 export declare const PartitionByItemNode: Readonly<{
     is(node: OperationNode): node is PartitionByItemNode;
-    create(partitionBy: ColumnNode | ReferenceNode): PartitionByItemNode;
+    create(partitionBy: SimpleReferenceExpressionNode): PartitionByItemNode;
 }>;

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

@@ -5,7 +5,6 @@ import { DeleteQueryNode } from './delete-query-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;
@@ -14,8 +13,8 @@ export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | Up
  */
 export declare const QueryNode: Readonly<{
     is(node: OperationNode): node is QueryNode;
-    cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: FilterExpressionNode): T;
-    cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: FilterExpressionNode): T_1;
+    cloneWithWhere<T extends FilterableQueryNode>(node: T, operation: OperationNode): T;
+    cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, operation: OperationNode): 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/query-node.js

@@ -18,20 +18,20 @@ exports.QueryNode = (0, object_utils_js_1.freeze)({
             update_query_node_js_1.UpdateQueryNode.is(node) ||
             select_query_node_js_1.SelectQueryNode.is(node));
     },
-    cloneWithWhere(node, filter) {
+    cloneWithWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             where: node.where
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.where, 'And', filter)
-                : where_node_js_1.WhereNode.create(filter),
+                ? where_node_js_1.WhereNode.cloneWithOperation(node.where, 'And', operation)
+                : where_node_js_1.WhereNode.create(operation),
         });
     },
-    cloneWithOrWhere(node, filter) {
+    cloneWithOrWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             where: node.where
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.where, 'Or', filter)
-                : where_node_js_1.WhereNode.create(filter),
+                ? where_node_js_1.WhereNode.cloneWithOperation(node.where, 'Or', operation)
+                : where_node_js_1.WhereNode.create(operation),
         });
     },
     cloneWithJoin(node, join) {

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

@@ -1,10 +1,9 @@
 import { OperationNode } from './operation-node.js';
-import { RawNode } from './raw-node.js';
 export declare type SelectModifier = 'ForUpdate' | 'ForNoKeyUpdate' | 'ForShare' | 'ForKeyShare' | 'NoWait' | 'SkipLocked' | 'Distinct';
 export interface SelectModifierNode extends OperationNode {
     readonly kind: 'SelectModifierNode';
     readonly modifier?: SelectModifier;
-    readonly rawModifier?: RawNode;
+    readonly rawModifier?: OperationNode;
 }
 /**
  * @internal
@@ -12,5 +11,5 @@ export interface SelectModifierNode extends OperationNode {
 export declare const SelectModifierNode: Readonly<{
     is(node: OperationNode): node is SelectModifierNode;
     create(modifier: SelectModifier): SelectModifierNode;
-    createWithRaw(modifier: RawNode): SelectModifierNode;
+    createWithExpression(modifier: OperationNode): SelectModifierNode;
 }>;

package/dist/cjs/operation-node/select-modifier-node.js

@@ -15,7 +15,7 @@ exports.SelectModifierNode = (0, object_utils_js_1.freeze)({
             modifier,
         });
     },
-    createWithRaw(modifier) {
+    createWithExpression(modifier) {
         return (0, object_utils_js_1.freeze)({
             kind: 'SelectModifierNode',
             rawModifier: modifier,

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

@@ -6,7 +6,6 @@ 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 { 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';
@@ -19,7 +18,7 @@ export interface SelectQueryNode extends OperationNode {
     readonly kind: 'SelectQueryNode';
     readonly from: FromNode;
     readonly selections?: ReadonlyArray<SelectionNode>;
-    readonly distinctOnSelections?: ReadonlyArray<SelectionNode>;
+    readonly distinctOn?: ReadonlyArray<OperationNode>;
     readonly joins?: ReadonlyArray<JoinNode>;
     readonly groupBy?: GroupByNode;
     readonly orderBy?: OrderByNode;
@@ -38,17 +37,17 @@ export interface SelectQueryNode extends OperationNode {
  */
 export declare const SelectQueryNode: Readonly<{
     is(node: OperationNode): node is SelectQueryNode;
-    create(fromItems: ReadonlyArray<TableExpressionNode>, withNode?: WithNode): SelectQueryNode;
+    create(fromItems: ReadonlyArray<OperationNode>, withNode?: WithNode): SelectQueryNode;
     cloneWithSelections(select: SelectQueryNode, selections: ReadonlyArray<SelectionNode>): SelectQueryNode;
-    cloneWithDistinctOnSelections(select: SelectQueryNode, selections: ReadonlyArray<SelectionNode>): SelectQueryNode;
+    cloneWithDistinctOn(select: SelectQueryNode, expressions: ReadonlyArray<OperationNode>): SelectQueryNode;
     cloneWithFrontModifier(select: SelectQueryNode, modifier: SelectModifierNode): SelectQueryNode;
     cloneWithEndModifier(select: SelectQueryNode, modifier: SelectModifierNode): SelectQueryNode;
     cloneWithOrderByItem(selectNode: SelectQueryNode, item: OrderByItemNode): SelectQueryNode;
     cloneWithGroupByItems(selectNode: SelectQueryNode, items: ReadonlyArray<GroupByItemNode>): SelectQueryNode;
     cloneWithLimit(selectNode: SelectQueryNode, limit: LimitNode): SelectQueryNode;
     cloneWithOffset(selectNode: SelectQueryNode, offset: OffsetNode): SelectQueryNode;
-    cloneWithHaving(selectNode: SelectQueryNode, filter: FilterExpressionNode): SelectQueryNode;
-    cloneWithOrHaving(selectNode: SelectQueryNode, filter: FilterExpressionNode): SelectQueryNode;
+    cloneWithHaving(selectNode: SelectQueryNode, operation: OperationNode): SelectQueryNode;
+    cloneWithOrHaving(selectNode: SelectQueryNode, operation: OperationNode): SelectQueryNode;
     cloneWithSetOperation(selectNode: SelectQueryNode, setOperation: SetOperationNode): SelectQueryNode;
     cloneWithExplain(selectNode: SelectQueryNode, explain: ExplainNode): SelectQueryNode;
 }>;

package/dist/cjs/operation-node/select-query-node.js

@@ -28,12 +28,12 @@ exports.SelectQueryNode = (0, object_utils_js_1.freeze)({
                 : (0, object_utils_js_1.freeze)(selections),
         });
     },
-    cloneWithDistinctOnSelections(select, selections) {
+    cloneWithDistinctOn(select, expressions) {
         return (0, object_utils_js_1.freeze)({
             ...select,
-            distinctOnSelections: select.distinctOnSelections
-                ? (0, object_utils_js_1.freeze)([...select.distinctOnSelections, ...selections])
-                : (0, object_utils_js_1.freeze)(selections),
+            distinctOn: select.distinctOn
+                ? (0, object_utils_js_1.freeze)([...select.distinctOn, ...expressions])
+                : (0, object_utils_js_1.freeze)(expressions),
         });
     },
     cloneWithFrontModifier(select, modifier) {
@@ -80,20 +80,20 @@ exports.SelectQueryNode = (0, object_utils_js_1.freeze)({
             offset,
         });
     },
-    cloneWithHaving(selectNode, filter) {
+    cloneWithHaving(selectNode, operation) {
         return (0, object_utils_js_1.freeze)({
             ...selectNode,
             having: selectNode.having
-                ? having_node_js_1.HavingNode.cloneWithFilter(selectNode.having, 'And', filter)
-                : having_node_js_1.HavingNode.create(filter),
+                ? having_node_js_1.HavingNode.cloneWithOperation(selectNode.having, 'And', operation)
+                : having_node_js_1.HavingNode.create(operation),
         });
     },
-    cloneWithOrHaving(selectNode, filter) {
+    cloneWithOrHaving(selectNode, operation) {
         return (0, object_utils_js_1.freeze)({
             ...selectNode,
             having: selectNode.having
-                ? having_node_js_1.HavingNode.cloneWithFilter(selectNode.having, 'Or', filter)
-                : having_node_js_1.HavingNode.create(filter),
+                ? having_node_js_1.HavingNode.cloneWithOperation(selectNode.having, 'Or', operation)
+                : having_node_js_1.HavingNode.create(operation),
         });
     },
     cloneWithSetOperation(selectNode, setOperation) {

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

@@ -1,10 +1,9 @@
 import { AliasNode } from './alias-node.js';
-import { ColumnNode } from './column-node.js';
 import { OperationNode } from './operation-node.js';
-import { ReferenceNode } from './reference-node.js';
 import { SelectAllNode } from './select-all-node.js';
+import { SimpleReferenceExpressionNode } from './simple-reference-expression-node.js';
 import { TableNode } from './table-node.js';
-declare type SelectionNodeChild = ColumnNode | ReferenceNode | AliasNode | SelectAllNode;
+declare type SelectionNodeChild = SimpleReferenceExpressionNode | AliasNode | SelectAllNode;
 export interface SelectionNode extends OperationNode {
     readonly kind: 'SelectionNode';
     readonly selection: SelectionNodeChild;

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

@@ -1,12 +1,9 @@
 import { OperationNode } from './operation-node.js';
-import { RawNode } from './raw-node.js';
-import { SelectQueryNode } from './select-query-node.js';
-export declare type SetOperationExpressionNode = SelectQueryNode | RawNode;
 export declare type SetOperator = 'union' | 'intersect' | 'except';
 export interface SetOperationNode extends OperationNode {
     kind: 'SetOperationNode';
     operator: SetOperator;
-    expression: SetOperationExpressionNode;
+    expression: OperationNode;
     all: boolean;
 }
 /**
@@ -14,5 +11,5 @@ export interface SetOperationNode extends OperationNode {
  */
 export declare const SetOperationNode: Readonly<{
     is(node: OperationNode): node is SetOperationNode;
-    create(operator: SetOperator, expression: SetOperationExpressionNode, all: boolean): SetOperationNode;
+    create(operator: SetOperator, expression: OperationNode, all: boolean): SetOperationNode;
 }>;

package/dist/cjs/operation-node/simple-reference-expression-node.d.ts

@@ -0,0 +1,3 @@
+import { ColumnNode } from './column-node.js';
+import { ReferenceNode } from './reference-node.js';
+export declare type SimpleReferenceExpressionNode = ColumnNode | ReferenceNode;

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

@@ -0,0 +1,13 @@
+import { OperationNode } from './operation-node.js';
+export interface UnaryOperationNode extends OperationNode {
+    readonly kind: 'UnaryOperationNode';
+    readonly operator: OperationNode;
+    readonly operand: OperationNode;
+}
+/**
+ * @internal
+ */
+export declare const UnaryOperationNode: Readonly<{
+    is(node: OperationNode): node is UnaryOperationNode;
+    create(operator: OperationNode, operand: OperationNode): UnaryOperationNode;
+}>;