kysely 0.22.0 → 0.23.0

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

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

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

@@ -1,21 +1,17 @@
-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';
 import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
 import { OperationNode } from './operation-node.js';
-import { RawNode } from './raw-node.js';
 import { ReturningNode } from './returning-node.js';
-import { SelectQueryNode } from './select-query-node.js';
 import { TableNode } from './table-node.js';
-import { ValuesNode } from './values-node.js';
 import { WithNode } from './with-node.js';
 export declare type InsertQueryNodeProps = Omit<InsertQueryNode, 'kind' | 'into'>;
 export interface InsertQueryNode extends OperationNode {
     readonly kind: 'InsertQueryNode';
     readonly into: TableNode;
     readonly columns?: ReadonlyArray<ColumnNode>;
-    readonly values?: ValuesNode | SelectQueryNode | RawNode | AggregateFunctionNode;
+    readonly values?: OperationNode;
     readonly returning?: ReturningNode;
     readonly onConflict?: OnConflictNode;
     readonly onDuplicateKey?: OnDuplicateKeyNode;

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

@@ -1,14 +1,10 @@
-import { AliasNode } from './alias-node.js';
 import { OnNode } from './on-node.js';
-import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
-import { TableNode } from './table-node.js';
-export declare type JoinTableNode = TableNode | AliasNode;
 export declare type JoinType = 'InnerJoin' | 'LeftJoin' | 'RightJoin' | 'FullJoin' | 'LateralInnerJoin' | 'LateralLeftJoin';
 export interface JoinNode extends OperationNode {
     readonly kind: 'JoinNode';
     readonly joinType: JoinType;
-    readonly table: JoinTableNode;
+    readonly table: OperationNode;
     readonly on?: OnNode;
 }
 /**
@@ -16,8 +12,8 @@ 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: FilterExpressionNode): JoinNode;
-    cloneWithOn(joinNode: JoinNode, filter: FilterExpressionNode): JoinNode;
-    cloneWithOrOn(joinNode: JoinNode, filter: FilterExpressionNode): JoinNode;
+    create(joinType: JoinType, table: OperationNode): JoinNode;
+    createWithOn(joinType: JoinType, table: OperationNode, on: OperationNode): JoinNode;
+    cloneWithOn(joinNode: JoinNode, operation: OperationNode): JoinNode;
+    cloneWithOrOn(joinNode: JoinNode, operation: OperationNode): JoinNode;
 }>;

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

@@ -24,20 +24,20 @@ export const JoinNode = freeze({
             on: OnNode.create(on),
         });
     },
-    cloneWithOn(joinNode, filter) {
+    cloneWithOn(joinNode, operation) {
         return freeze({
             ...joinNode,
             on: joinNode.on
-                ? OnNode.cloneWithFilter(joinNode.on, 'And', filter)
-                : OnNode.create(filter),
+                ? OnNode.cloneWithOperation(joinNode.on, 'And', operation)
+                : OnNode.create(operation),
         });
     },
-    cloneWithOrOn(joinNode, filter) {
+    cloneWithOrOn(joinNode, operation) {
         return freeze({
             ...joinNode,
             on: joinNode.on
-                ? OnNode.cloneWithFilter(joinNode.on, 'Or', filter)
-                : OnNode.create(filter),
+                ? OnNode.cloneWithOperation(joinNode.on, 'Or', operation)
+                : OnNode.create(operation),
         });
     },
 });

package/dist/esm/operation-node/on-conflict-node.d.ts

@@ -1,16 +1,14 @@
 import { ColumnNode } from './column-node.js';
 import { ColumnUpdateNode } from './column-update-node.js';
 import { IdentifierNode } from './identifier-node.js';
-import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
-import { RawNode } from './raw-node.js';
 import { WhereNode } from './where-node.js';
 export declare type OnConflictNodeProps = Omit<OnConflictNode, 'kind' | 'indexWhere' | 'updateWhere'>;
 export interface OnConflictNode extends OperationNode {
     readonly kind: 'OnConflictNode';
     readonly columns?: ReadonlyArray<ColumnNode>;
     readonly constraint?: IdentifierNode;
-    readonly indexExpression?: RawNode;
+    readonly indexExpression?: OperationNode;
     readonly indexWhere?: WhereNode;
     readonly updates?: ReadonlyArray<ColumnUpdateNode>;
     readonly updateWhere?: WhereNode;
@@ -23,8 +21,8 @@ export declare const OnConflictNode: Readonly<{
     is(node: OperationNode): node is OnConflictNode;
     create(): OnConflictNode;
     cloneWith(node: OnConflictNode, props: OnConflictNodeProps): OnConflictNode;
-    cloneWithIndexWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
-    cloneWithIndexOrWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
-    cloneWithUpdateWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
-    cloneWithUpdateOrWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
+    cloneWithIndexWhere(node: OnConflictNode, operation: OperationNode): OnConflictNode;
+    cloneWithIndexOrWhere(node: OnConflictNode, operation: OperationNode): OnConflictNode;
+    cloneWithUpdateWhere(node: OnConflictNode, operation: OperationNode): OnConflictNode;
+    cloneWithUpdateOrWhere(node: OnConflictNode, operation: OperationNode): OnConflictNode;
 }>;

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

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

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

@@ -15,12 +15,12 @@ export const OnNode = freeze({
             on: filter,
         });
     },
-    cloneWithFilter(onNode, op, filter) {
+    cloneWithOperation(onNode, operator, operation) {
         return freeze({
             ...onNode,
-            on: op === 'And'
-                ? AndNode.create(onNode.on, filter)
-                : OrNode.create(onNode.on, filter),
+            on: operator === 'And'
+                ? AndNode.create(onNode.on, operation)
+                : OrNode.create(onNode.on, operation),
         });
     },
 });

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

@@ -44,7 +44,6 @@ export 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),
@@ -109,6 +108,8 @@ export 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) {
@@ -133,7 +134,7 @@ export 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),
@@ -186,14 +187,6 @@ export class OperationNodeTransformer {
             column: this.transformNode(node.column),
         });
     }
-    transformFilter(node) {
-        return requireAllProps({
-            kind: 'FilterNode',
-            left: this.transformNode(node.left),
-            op: this.transformNode(node.op),
-            right: this.transformNode(node.right),
-        });
-    }
     transformAnd(node) {
         return requireAllProps({
             kind: 'AndNode',
@@ -308,6 +301,8 @@ export 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) {
@@ -520,11 +515,7 @@ export 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),
         });
@@ -657,6 +648,7 @@ export 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),
         });
@@ -680,6 +672,21 @@ export class OperationNodeTransformer {
             partitionBy: this.transformNode(node.partitionBy),
         });
     }
+    transformBinaryOperation(node) {
+        return requireAllProps({
+            kind: 'BinaryOperationNode',
+            leftOperand: this.transformNode(node.leftOperand),
+            operator: this.transformNode(node.operator),
+            rightOperand: this.transformNode(node.rightOperand),
+        });
+    }
+    transformUnaryOperation(node) {
+        return 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/esm/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/esm/operation-node/operation-node-visitor.js

@@ -17,7 +17,6 @@ export 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),
@@ -82,6 +81,8 @@ export 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/esm/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/esm/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/esm/operation-node/operator-node.js

@@ -1,6 +1,6 @@
 /// <reference types="./operator-node.d.ts" />
 import { freeze } from '../util/object-utils.js';
-export const OPERATORS = [
+export const COMPARISON_OPERATORS = [
     '=',
     '==',
     '!=',
@@ -20,7 +20,6 @@ export const OPERATORS = [
     '@>',
     '<@',
     '?',
-    '?',
     '?&',
     '!<',
     '!>',
@@ -29,8 +28,6 @@ export const OPERATORS = [
     '~',
     '~*',
     '!~*',
-    'exists',
-    'not exists',
     '&&',
     '||',
     '@@',
@@ -38,6 +35,7 @@ export const OPERATORS = [
     '!!',
     '<->',
 ];
+export const UNARY_FILTER_OPERATORS = ['exists', 'not exists'];
 /**
  * @internal
  */

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

@@ -16,20 +16,20 @@ export const QueryNode = freeze({
             UpdateQueryNode.is(node) ||
             SelectQueryNode.is(node));
     },
-    cloneWithWhere(node, filter) {
+    cloneWithWhere(node, operation) {
         return freeze({
             ...node,
             where: node.where
-                ? WhereNode.cloneWithFilter(node.where, 'And', filter)
-                : WhereNode.create(filter),
+                ? WhereNode.cloneWithOperation(node.where, 'And', operation)
+                : WhereNode.create(operation),
         });
     },
-    cloneWithOrWhere(node, filter) {
+    cloneWithOrWhere(node, operation) {
         return freeze({
             ...node,
             where: node.where
-                ? WhereNode.cloneWithFilter(node.where, 'Or', filter)
-                : WhereNode.create(filter),
+                ? WhereNode.cloneWithOperation(node.where, 'Or', operation)
+                : WhereNode.create(operation),
         });
     },
     cloneWithJoin(node, join) {

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

@@ -13,7 +13,7 @@ export const SelectModifierNode = freeze({
             modifier,
         });
     },
-    createWithRaw(modifier) {
+    createWithExpression(modifier) {
         return freeze({
             kind: 'SelectModifierNode',
             rawModifier: modifier,