kysely 0.9.0 → 0.9.4

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

@@ -57,66 +57,68 @@ 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';
-export declare class OperationNodeVisitor {
+import { UnionNode } from './union-node.js';
+export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
     protected readonly visitNode: (node: OperationNode) => void;
-    protected visitSelectQuery(node: SelectQueryNode): void;
-    protected visitSelection(node: SelectionNode): void;
-    protected visitColumn(node: ColumnNode): void;
-    protected visitAlias(node: AliasNode): void;
-    protected visitTable(node: TableNode): void;
-    protected visitFrom(node: FromNode): void;
-    protected visitReference(node: ReferenceNode): void;
-    protected visitFilter(node: FilterNode): void;
-    protected visitAnd(node: AndNode): void;
-    protected visitOr(node: OrNode): void;
-    protected visitValueList(node: ValueListNode): void;
-    protected visitParens(node: ParensNode): void;
-    protected visitJoin(node: JoinNode): void;
-    protected visitRaw(node: RawNode): void;
-    protected visitWhere(node: WhereNode): void;
-    protected visitInsertQuery(node: InsertQueryNode): void;
-    protected visitDeleteQuery(node: DeleteQueryNode): void;
-    protected visitReturning(node: ReturningNode): void;
-    protected visitCreateTable(node: CreateTableNode): void;
-    protected visitAddColumn(node: AddColumnNode): void;
-    protected visitColumnDefinition(node: ColumnDefinitionNode): void;
-    protected visitDropTable(node: DropTableNode): void;
-    protected visitOrderBy(node: OrderByNode): void;
-    protected visitOrderByItem(node: OrderByItemNode): void;
-    protected visitGroupBy(node: GroupByNode): void;
-    protected visitGroupByItem(node: GroupByItemNode): void;
-    protected visitUpdateQuery(node: UpdateQueryNode): void;
-    protected visitColumnUpdate(node: ColumnUpdateNode): void;
-    protected visitLimit(node: LimitNode): void;
-    protected visitOffset(node: OffsetNode): void;
-    protected visitOnConflict(node: OnConflictNode): void;
-    protected visitOnDuplicateKey(node: OnDuplicateKeyNode): void;
-    protected visitCreateIndex(node: CreateIndexNode): void;
-    protected visitList(node: ListNode): void;
-    protected visitDropIndex(node: DropIndexNode): void;
-    protected visitPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): void;
-    protected visitUniqueConstraint(node: UniqueConstraintNode): void;
-    protected visitReferences(node: ReferencesNode): void;
-    protected visitCheckConstraint(node: CheckConstraintNode): void;
-    protected visitWith(node: WithNode): void;
-    protected visitCommonTableExpression(node: CommonTableExpressionNode): void;
-    protected visitHaving(node: HavingNode): void;
-    protected visitCreateSchema(node: CreateSchemaNode): void;
-    protected visitDropSchema(node: DropSchemaNode): void;
-    protected visitAlterTable(node: AlterTableNode): void;
-    protected visitDropColumn(node: DropColumnNode): void;
-    protected visitRenameColumn(node: RenameColumnNode): void;
-    protected visitAlterColumn(node: AlterColumnNode): void;
-    protected visitModifyColumn(node: ModifyColumnNode): void;
-    protected visitAddConstraint(node: AddConstraintNode): void;
-    protected visitDropConstraint(node: DropConstraintNode): void;
-    protected visitForeignKeyConstraint(node: ForeignKeyConstraintNode): void;
-    protected visitDataType(node: DataTypeNode): void;
-    protected visitSelectAll(_: SelectAllNode): void;
-    protected visitIdentifier(_: IdentifierNode): void;
-    protected visitValue(_: ValueNode): void;
-    protected visitPrimitiveValueList(_: PrimitiveValueListNode): void;
-    protected visitOperator(node: OperatorNode): void;
+    protected abstract visitSelectQuery(node: SelectQueryNode): void;
+    protected abstract visitSelection(node: SelectionNode): void;
+    protected abstract visitColumn(node: ColumnNode): void;
+    protected abstract visitAlias(node: AliasNode): void;
+    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;
+    protected abstract visitParens(node: ParensNode): void;
+    protected abstract visitJoin(node: JoinNode): void;
+    protected abstract visitRaw(node: RawNode): void;
+    protected abstract visitWhere(node: WhereNode): void;
+    protected abstract visitInsertQuery(node: InsertQueryNode): void;
+    protected abstract visitDeleteQuery(node: DeleteQueryNode): void;
+    protected abstract visitReturning(node: ReturningNode): void;
+    protected abstract visitCreateTable(node: CreateTableNode): void;
+    protected abstract visitAddColumn(node: AddColumnNode): void;
+    protected abstract visitColumnDefinition(node: ColumnDefinitionNode): void;
+    protected abstract visitDropTable(node: DropTableNode): void;
+    protected abstract visitOrderBy(node: OrderByNode): void;
+    protected abstract visitOrderByItem(node: OrderByItemNode): void;
+    protected abstract visitGroupBy(node: GroupByNode): void;
+    protected abstract visitGroupByItem(node: GroupByItemNode): void;
+    protected abstract visitUpdateQuery(node: UpdateQueryNode): void;
+    protected abstract visitColumnUpdate(node: ColumnUpdateNode): void;
+    protected abstract visitLimit(node: LimitNode): void;
+    protected abstract visitOffset(node: OffsetNode): void;
+    protected abstract visitOnConflict(node: OnConflictNode): void;
+    protected abstract visitOnDuplicateKey(node: OnDuplicateKeyNode): void;
+    protected abstract visitCreateIndex(node: CreateIndexNode): void;
+    protected abstract visitDropIndex(node: DropIndexNode): void;
+    protected abstract visitList(node: ListNode): void;
+    protected abstract visitPrimaryKeyConstraint(node: PrimaryKeyConstraintNode): void;
+    protected abstract visitUniqueConstraint(node: UniqueConstraintNode): void;
+    protected abstract visitReferences(node: ReferencesNode): void;
+    protected abstract visitCheckConstraint(node: CheckConstraintNode): void;
+    protected abstract visitWith(node: WithNode): void;
+    protected abstract visitCommonTableExpression(node: CommonTableExpressionNode): void;
+    protected abstract visitHaving(node: HavingNode): void;
+    protected abstract visitCreateSchema(node: CreateSchemaNode): void;
+    protected abstract visitDropSchema(node: DropSchemaNode): void;
+    protected abstract visitAlterTable(node: AlterTableNode): void;
+    protected abstract visitDropColumn(node: DropColumnNode): void;
+    protected abstract visitRenameColumn(node: RenameColumnNode): void;
+    protected abstract visitAlterColumn(node: AlterColumnNode): void;
+    protected abstract visitModifyColumn(node: ModifyColumnNode): void;
+    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(_: SelectAllNode): void;
+    protected abstract visitIdentifier(_: IdentifierNode): void;
+    protected abstract visitValue(_: ValueNode): void;
+    protected abstract visitPrimitiveValueList(_: PrimitiveValueListNode): void;
+    protected abstract visitOperator(node: OperatorNode): void;
 }

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

@@ -62,327 +62,12 @@ class OperationNodeVisitor {
         AddConstraintNode: this.visitAddConstraint.bind(this),
         DropConstraintNode: this.visitDropConstraint.bind(this),
         ForeignKeyConstraintNode: this.visitForeignKeyConstraint.bind(this),
+        UnionNode: this.visitUnion.bind(this),
     };
     visitNode = (node) => {
         this.nodeStack.push(node);
         this.#visitors[node.kind](node);
         this.nodeStack.pop();
     };
-    visitSelectQuery(node) {
-        if (node.with) {
-            this.visitNode(node.with);
-        }
-        if (node.distinctOnSelections) {
-            node.distinctOnSelections.forEach(this.visitNode);
-        }
-        if (node.selections) {
-            node.selections.forEach(this.visitNode);
-        }
-        this.visitNode(node.from);
-        if (node.joins) {
-            node.joins.forEach(this.visitNode);
-        }
-        if (node.where) {
-            this.visitNode(node.where);
-        }
-        if (node.groupBy) {
-            this.visitNode(node.groupBy);
-        }
-        if (node.having) {
-            this.visitNode(node.having);
-        }
-        if (node.orderBy) {
-            this.visitNode(node.orderBy);
-        }
-        if (node.limit) {
-            this.visitNode(node.limit);
-        }
-        if (node.offset) {
-            this.visitNode(node.offset);
-        }
-    }
-    visitSelection(node) {
-        this.visitNode(node.selection);
-    }
-    visitColumn(node) {
-        this.visitNode(node.column);
-    }
-    visitAlias(node) {
-        this.visitNode(node.node);
-    }
-    visitTable(node) {
-        if (node.schema) {
-            this.visitNode(node.schema);
-        }
-        this.visitNode(node.table);
-    }
-    visitFrom(node) {
-        node.froms.forEach(this.visitNode);
-    }
-    visitReference(node) {
-        this.visitNode(node.column);
-        this.visitNode(node.table);
-    }
-    visitFilter(node) {
-        if (node.left) {
-            this.visitNode(node.left);
-        }
-        this.visitNode(node.op);
-        this.visitNode(node.right);
-    }
-    visitAnd(node) {
-        this.visitNode(node.left);
-        this.visitNode(node.right);
-    }
-    visitOr(node) {
-        this.visitNode(node.left);
-        this.visitNode(node.right);
-    }
-    visitValueList(node) {
-        node.values.forEach(this.visitNode);
-    }
-    visitParens(node) {
-        this.visitNode(node.node);
-    }
-    visitJoin(node) {
-        this.visitNode(node.table);
-        if (node.on) {
-            this.visitNode(node.on);
-        }
-    }
-    visitRaw(node) {
-        node.params.forEach(this.visitNode);
-    }
-    visitWhere(node) {
-        this.visitNode(node.where);
-    }
-    visitInsertQuery(node) {
-        if (node.with) {
-            this.visitNode(node.with);
-        }
-        this.visitNode(node.into);
-        if (node.columns) {
-            node.columns.forEach(this.visitNode);
-        }
-        if (node.values) {
-            node.values.forEach(this.visitNode);
-        }
-        if (node.returning) {
-            this.visitNode(node.returning);
-        }
-    }
-    visitDeleteQuery(node) {
-        if (node.with) {
-            this.visitNode(node.with);
-        }
-        this.visitNode(node.from);
-        if (node.joins) {
-            node.joins.forEach(this.visitNode);
-        }
-        if (node.where) {
-            this.visitNode(node.where);
-        }
-        if (node.returning) {
-            this.visitNode(node.returning);
-        }
-    }
-    visitReturning(node) {
-        node.selections.forEach(this.visitNode);
-    }
-    visitCreateTable(node) {
-        this.visitNode(node.table);
-        node.columns.forEach(this.visitNode);
-        if (node.constraints) {
-            node.constraints.forEach(this.visitNode);
-        }
-    }
-    visitAddColumn(node) {
-        this.visitNode(node.column);
-    }
-    visitColumnDefinition(node) {
-        this.visitNode(node.column);
-        this.visitNode(node.dataType);
-        if (node.defaultTo) {
-            this.visitNode(node.defaultTo);
-        }
-        if (node.references) {
-            this.visitNode(node.references);
-        }
-        if (node.check) {
-            this.visitNode(node.check);
-        }
-    }
-    visitDropTable(node) {
-        this.visitNode(node.table);
-    }
-    visitOrderBy(node) {
-        node.items.forEach(this.visitNode);
-    }
-    visitOrderByItem(node) {
-        this.visitNode(node.orderBy);
-    }
-    visitGroupBy(node) {
-        node.items.forEach(this.visitNode);
-    }
-    visitGroupByItem(node) {
-        this.visitNode(node.groupBy);
-    }
-    visitUpdateQuery(node) {
-        if (node.with) {
-            this.visitNode(node.with);
-        }
-        this.visitNode(node.table);
-        if (node.updates) {
-            node.updates.forEach(this.visitNode);
-        }
-        if (node.joins) {
-            node.joins.forEach(this.visitNode);
-        }
-        if (node.where) {
-            this.visitNode(node.where);
-        }
-        if (node.returning) {
-            this.visitNode(node.returning);
-        }
-    }
-    visitColumnUpdate(node) {
-        this.visitNode(node.column);
-        this.visitNode(node.value);
-    }
-    visitLimit(node) {
-        this.visitNode(node.limit);
-    }
-    visitOffset(node) {
-        this.visitNode(node.offset);
-    }
-    visitOnConflict(node) {
-        if (node.columns) {
-            node.columns.forEach(this.visitNode);
-        }
-        if (node.constraint) {
-            this.visitNode(node.constraint);
-        }
-        if (node.updates) {
-            node.updates.forEach(this.visitNode);
-        }
-    }
-    visitOnDuplicateKey(node) {
-        node.updates.forEach(this.visitNode);
-    }
-    visitCreateIndex(node) {
-        this.visitNode(node.name);
-        if (node.table) {
-            this.visitNode(node.table);
-        }
-        if (node.using) {
-            this.visitNode(node.using);
-        }
-        if (node.expression) {
-            this.visitNode(node.expression);
-        }
-    }
-    visitList(node) {
-        node.items.forEach(this.visitNode);
-    }
-    visitDropIndex(node) {
-        this.visitNode(node.name);
-        if (node.table) {
-            this.visitNode(node.table);
-        }
-    }
-    visitPrimaryKeyConstraint(node) {
-        if (node.name) {
-            this.visitNode(node.name);
-        }
-        node.columns.forEach(this.visitNode);
-    }
-    visitUniqueConstraint(node) {
-        if (node.name) {
-            this.visitNode(node.name);
-        }
-        node.columns.forEach(this.visitNode);
-    }
-    visitReferences(node) {
-        node.columns.forEach(this.visitNode);
-        this.visitNode(node.table);
-    }
-    visitCheckConstraint(node) {
-        if (node.name) {
-            this.visitNode(node.name);
-        }
-        this.visitNode(node.expression);
-    }
-    visitWith(node) {
-        node.expressions.forEach(this.visitNode);
-    }
-    visitCommonTableExpression(node) {
-        this.visitNode(node.name);
-        this.visitNode(node.expression);
-    }
-    visitHaving(node) {
-        this.visitNode(node.having);
-    }
-    visitCreateSchema(node) {
-        this.visitNode(node.schema);
-    }
-    visitDropSchema(node) {
-        this.visitNode(node.schema);
-    }
-    visitAlterTable(node) {
-        this.visitNode(node.table);
-        if (node.renameTo) {
-            this.visitNode(node.renameTo);
-        }
-        if (node.renameColumn) {
-            this.visitNode(node.renameColumn);
-        }
-        if (node.setSchema) {
-            this.visitNode(node.setSchema);
-        }
-        if (node.addColumn) {
-            this.visitNode(node.addColumn);
-        }
-        if (node.dropColumn) {
-            this.visitNode(node.dropColumn);
-        }
-        if (node.alterColumn) {
-            this.visitNode(node.alterColumn);
-        }
-        if (node.modifyColumn) {
-            this.visitNode(node.modifyColumn);
-        }
-    }
-    visitDropColumn(node) {
-        this.visitNode(node.column);
-    }
-    visitRenameColumn(node) {
-        this.visitNode(node.column);
-        this.visitNode(node.renameTo);
-    }
-    visitAlterColumn(node) {
-        this.visitNode(node.column);
-    }
-    visitModifyColumn(node) {
-        this.visitNode(node.column);
-    }
-    visitAddConstraint(node) {
-        this.visitNode(node.constraint);
-    }
-    visitDropConstraint(node) {
-        this.visitNode(node.constraintName);
-    }
-    visitForeignKeyConstraint(node) {
-        if (node.name) {
-            this.visitNode(node.name);
-        }
-        node.columns.forEach(this.visitNode);
-        this.visitNode(node.references);
-    }
-    visitDataType(node) { }
-    visitSelectAll(_) { }
-    visitIdentifier(_) { }
-    visitValue(_) { }
-    visitPrimitiveValueList(_) { }
-    visitOperator(node) { }
 }
 exports.OperationNodeVisitor = OperationNodeVisitor;

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

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

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

@@ -16,7 +16,8 @@ export declare const QueryNode: Readonly<{
     is(node: OperationNode): node is QueryNode;
     isMutating(node: OperationNode): node is MutatingQueryNode;
     isFilterable(node: OperationNode): node is FilterableQueryNode;
-    cloneWithWhere<T extends FilterableQueryNode>(node: T, op: 'And' | 'Or', filter: WhereChildNode): T;
-    cloneWithJoin<T_1 extends FilterableQueryNode>(node: T_1, join: JoinNode): T_1;
-    cloneWithReturning<T_2 extends MutatingQueryNode>(node: T_2, selections: ReadonlyArray<SelectionNode>): T_2;
+    cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: WhereChildNode): T;
+    cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: WhereChildNode): 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

@@ -28,11 +28,19 @@ exports.QueryNode = (0, object_utils_js_1.freeze)({
             delete_query_node_js_1.DeleteQueryNode.is(node) ||
             update_query_node_js_1.UpdateQueryNode.is(node));
     },
-    cloneWithWhere(node, op, filter) {
+    cloneWithWhere(node, filter) {
         return (0, object_utils_js_1.freeze)({
             ...node,
             where: node.where
-                ? where_node_js_1.WhereNode.cloneWithFilter(node.where, op, filter)
+                ? where_node_js_1.WhereNode.cloneWithFilter(node.where, 'And', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
+    cloneWithOrWhere(node, filter) {
+        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),
         });
     },

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

@@ -12,6 +12,7 @@ import { OrderByNode } from './order-by-node.js';
 import { SelectionNode } from './selection-node.js';
 import { WhereNode } from './where-node.js';
 import { WithNode } from './with-node.js';
+import { UnionNode } from './union-node.js';
 export declare type SelectModifier = 'ForUpdate' | 'ForNoKeyUpdate' | 'ForShare' | 'ForKeyShare' | 'NoWait' | 'SkipLocked';
 export interface SelectQueryNode extends OperationNode {
     readonly kind: 'SelectQueryNode';
@@ -28,6 +29,7 @@ export interface SelectQueryNode extends OperationNode {
     readonly offset?: OffsetNode;
     readonly with?: WithNode;
     readonly having?: HavingNode;
+    readonly union?: ReadonlyArray<UnionNode>;
 }
 /**
  * @internal
@@ -42,6 +44,8 @@ export declare const SelectQueryNode: Readonly<{
     cloneWithGroupByItems(selectNode: SelectQueryNode, items: ReadonlyArray<GroupByItemNode>): SelectQueryNode;
     cloneWithLimit(selectNode: SelectQueryNode, limit: LimitNode): SelectQueryNode;
     cloneWithOffset(selectNode: SelectQueryNode, offset: OffsetNode): SelectQueryNode;
-    cloneWithHaving(selectNode: SelectQueryNode, op: 'And' | 'Or', filter: HavingNodeChild): SelectQueryNode;
+    cloneWithHaving(selectNode: SelectQueryNode, filter: HavingNodeChild): SelectQueryNode;
+    cloneWithOrHaving(selectNode: SelectQueryNode, filter: HavingNodeChild): SelectQueryNode;
     cloneWithDistinct(selectNode: SelectQueryNode): SelectQueryNode;
+    cloneWithUnion(selectNode: SelectQueryNode, union: UnionNode): SelectQueryNode;
 }>;

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

@@ -72,11 +72,19 @@ exports.SelectQueryNode = (0, object_utils_js_1.freeze)({
             offset,
         });
     },
-    cloneWithHaving(selectNode, op, filter) {
+    cloneWithHaving(selectNode, filter) {
         return (0, object_utils_js_1.freeze)({
             ...selectNode,
             having: selectNode.having
-                ? having_node_js_1.HavingNode.cloneWithFilter(selectNode.having, op, filter)
+                ? having_node_js_1.HavingNode.cloneWithFilter(selectNode.having, 'And', filter)
+                : having_node_js_1.HavingNode.create(filter),
+        });
+    },
+    cloneWithOrHaving(selectNode, filter) {
+        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),
         });
     },
@@ -86,4 +94,12 @@ exports.SelectQueryNode = (0, object_utils_js_1.freeze)({
             isDistinct: true,
         });
     },
+    cloneWithUnion(selectNode, union) {
+        return (0, object_utils_js_1.freeze)({
+            ...selectNode,
+            union: selectNode.union
+                ? (0, object_utils_js_1.freeze)([...selectNode.union, union])
+                : (0, object_utils_js_1.freeze)([union]),
+        });
+    },
 });

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

@@ -0,0 +1,16 @@
+import { OperationNode } from './operation-node.js';
+import { RawNode } from './raw-node.js';
+import { SelectQueryNode } from './select-query-node.js';
+export declare type UnionExpressionNode = SelectQueryNode | RawNode;
+export interface UnionNode extends OperationNode {
+    readonly kind: 'UnionNode';
+    readonly union: UnionExpressionNode;
+    readonly all: boolean;
+}
+/**
+ * @internal
+ */
+export declare const UnionNode: Readonly<{
+    is(node: OperationNode): node is UnionNode;
+    create(union: UnionExpressionNode, all: boolean): UnionNode;
+}>;

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnionNode = void 0;
+const object_utils_js_1 = require("../util/object-utils.js");
+/**
+ * @internal
+ */
+exports.UnionNode = (0, object_utils_js_1.freeze)({
+    is(node) {
+        return node.kind === 'UnionNode';
+    },
+    create(union, all) {
+        return (0, object_utils_js_1.freeze)({
+            kind: 'UnionNode',
+            union,
+            all,
+        });
+    },
+});

package/dist/cjs/parser/group-by-parser.d.ts

@@ -0,0 +1,4 @@
+import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
+import { ParseContext } from './parse-context.js';
+import { ReferenceExpressionOrList } from './reference-parser.js';
+export declare function parseGroupBy(ctx: ParseContext, orderBy: ReferenceExpressionOrList<any, any>): GroupByItemNode[];

package/dist/cjs/parser/group-by-parser.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseGroupBy = void 0;
+const group_by_item_node_js_1 = require("../operation-node/group-by-item-node.js");
+const reference_parser_js_1 = require("./reference-parser.js");
+function parseGroupBy(ctx, orderBy) {
+    return (0, reference_parser_js_1.parseReferenceExpressionOrList)(ctx, orderBy).map(group_by_item_node_js_1.GroupByItemNode.create);
+}
+exports.parseGroupBy = parseGroupBy;

package/dist/cjs/parser/insert-values-parser.d.ts

@@ -8,7 +8,7 @@ import { PrimitiveValue } from '../util/object-utils.js';
 export declare type InsertObject<DB, TB extends keyof DB> = {
     [C in keyof DB[TB]]: InsertValueExpression<DB[TB][C]>;
 };
-export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | InsertObject<DB, TB>[];
+export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
 declare type InsertValueExpression<T> = T | AnyQueryBuilder | AnyRawBuilder | GeneratedPlaceholder;
 export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ReadonlyArray<InsertValuesNode>];
 export declare function parseInsertValueExpression(value: InsertValueExpression<PrimitiveValue>): ValueNode | RawNode | SelectQueryNode;

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

@@ -3,9 +3,9 @@ import { AnyColumn, AnyColumnWithTable } from '../util/type-utils.js';
 import { ExtractAliasFromTableExpression, TableExpressionDatabase } from './table-parser.js';
 import { JoinBuilder } from '../query-builder/join-builder.js';
 import { ParseContext } from './parse-context.js';
-export declare type JoinReferenceExpression<DB, TB extends keyof DB, F> = AnyJoinColumn<DB, TB, F> | AnyJoinColumnWithTable<DB, TB, F>;
-export declare type JoinCallbackExpression<DB, TB extends keyof DB, F> = (join: JoinBuilder<TableExpressionDatabase<DB, F>, TB | ExtractAliasFromTableExpression<DB, F>>) => JoinBuilder<any, any>;
-declare type AnyJoinColumn<DB, TB extends keyof DB, F> = AnyColumn<TableExpressionDatabase<DB, F>, TB | ExtractAliasFromTableExpression<DB, F>>;
-declare type AnyJoinColumnWithTable<DB, TB extends keyof DB, F> = AnyColumnWithTable<TableExpressionDatabase<DB, F>, TB | ExtractAliasFromTableExpression<DB, F>>;
+export declare type JoinReferenceExpression<DB, TB extends keyof DB, TE> = AnyJoinColumn<DB, TB, TE> | AnyJoinColumnWithTable<DB, TB, TE>;
+export declare type JoinCallbackExpression<DB, TB extends keyof DB, TE> = (join: JoinBuilder<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>) => JoinBuilder<any, any>;
+declare type AnyJoinColumn<DB, TB extends keyof DB, TE> = AnyColumn<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>;
+declare type AnyJoinColumnWithTable<DB, TB extends keyof DB, TE> = AnyColumnWithTable<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>;
 export declare function parseJoin(ctx: ParseContext, joinType: JoinType, args: any[]): JoinNode;
 export {};

package/dist/cjs/parser/order-by-parser.d.ts

@@ -1,10 +1,8 @@
-import { ReferenceExpressionNode } from '../operation-node/operation-node-utils.js';
-import { RawNode } from '../operation-node/raw-node.js';
+import { OrderByItemNode } from '../operation-node/order-by-item-node.js';
 import { AnyRawBuilder } from '../util/type-utils.js';
 import { ParseContext } from './parse-context.js';
 import { ReferenceExpression } from './reference-parser.js';
 export declare type OrderByDirection = 'asc' | 'desc';
 export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | keyof O;
 export declare type OrderByDirectionExpression = OrderByDirection | AnyRawBuilder;
-export declare function parseOrderByExpression(ctx: ParseContext, expr: OrderByExpression<any, any, any>): ReferenceExpressionNode;
-export declare function parseOrderByDirectionExpression(expr?: OrderByDirectionExpression): RawNode | undefined;
+export declare function parseOrderBy(ctx: ParseContext, orderBy: OrderByExpression<any, any, any>, direction?: OrderByDirectionExpression): OrderByItemNode;