kysely 0.24.1 → 0.25.0

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

@@ -9,7 +9,7 @@ export interface CreateIndexNode extends OperationNode {
     readonly kind: 'CreateIndexNode';
     readonly name: IdentifierNode;
     readonly table?: TableNode;
-    readonly expression?: OperationNode;
+    readonly columns?: OperationNode[];
     readonly unique?: boolean;
     readonly using?: RawNode;
     readonly ifNotExists?: boolean;
@@ -22,4 +22,5 @@ export declare const CreateIndexNode: Readonly<{
     is(node: OperationNode): node is CreateIndexNode;
     create(name: string): CreateIndexNode;
     cloneWith(node: CreateIndexNode, props: CreateIndexNodeProps): CreateIndexNode;
+    cloneWithColumns(node: CreateIndexNode, columns: OperationNode[]): CreateIndexNode;
 }>;

package/dist/cjs/operation-node/create-index-node.js

@@ -22,4 +22,10 @@ exports.CreateIndexNode = (0, object_utils_js_1.freeze)({
             ...props,
         });
     },
+    cloneWithColumns(node, columns) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            columns: [...(node.columns || []), ...columns],
+        });
+    },
 });

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

@@ -1,5 +1,5 @@
 import { OperationNode } from './operation-node.js';
-export declare type ColumnDataType = 'varchar' | `varchar(${number})` | 'text' | 'integer' | 'int2' | 'int4' | 'int8' | 'bigint' | 'boolean' | 'real' | 'double precision' | 'float4' | 'float8' | 'decimal' | `decimal(${number}, ${number})` | 'numeric' | `numeric(${number}, ${number})` | 'binary' | 'date' | 'datetime' | `datetime(${number})` | 'time' | `time(${number})` | 'timetz' | `timetz(${number})` | 'timestamp' | `timestamp(${number})` | 'timestamptz' | `timestamptz(${number})` | 'serial' | 'bigserial' | 'uuid' | 'json' | 'jsonb' | 'blob';
+export declare type ColumnDataType = 'varchar' | `varchar(${number})` | 'char' | `char(${number})` | 'text' | 'integer' | 'int2' | 'int4' | 'int8' | 'bigint' | 'boolean' | 'real' | 'double precision' | 'float4' | 'float8' | 'decimal' | `decimal(${number}, ${number})` | 'numeric' | `numeric(${number}, ${number})` | 'binary' | `binary(${number})` | 'bytea' | 'date' | 'datetime' | `datetime(${number})` | 'time' | `time(${number})` | 'timetz' | `timetz(${number})` | 'timestamp' | `timestamp(${number})` | 'timestamptz' | `timestamptz(${number})` | 'serial' | 'bigserial' | 'uuid' | 'json' | 'jsonb' | 'blob';
 export declare type DataTypeParams = Omit<DataTypeNode, 'kind' | 'dataType'>;
 export interface DataTypeNode extends OperationNode {
     readonly kind: 'DataTypeNode';

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

@@ -78,6 +78,8 @@ import { BinaryOperationNode } from './binary-operation-node.js';
 import { UnaryOperationNode } from './unary-operation-node.js';
 import { UsingNode } from './using-node.js';
 import { FunctionNode } from './function-node.js';
+import { CaseNode } from './case-node.js';
+import { WhenNode } from './when-node.js';
 /**
  * Transforms an operation node tree into another one.
  *
@@ -185,6 +187,8 @@ export declare class OperationNodeTransformer {
     protected transformUnaryOperation(node: UnaryOperationNode): UnaryOperationNode;
     protected transformUsing(node: UsingNode): UsingNode;
     protected transformFunction(node: FunctionNode): FunctionNode;
+    protected transformCase(node: CaseNode): CaseNode;
+    protected transformWhen(node: WhenNode): WhenNode;
     protected transformDataType(node: DataTypeNode): DataTypeNode;
     protected transformSelectAll(node: SelectAllNode): SelectAllNode;
     protected transformIdentifier(node: IdentifierNode): IdentifierNode;

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

@@ -114,6 +114,8 @@ class OperationNodeTransformer {
         UnaryOperationNode: this.transformUnaryOperation.bind(this),
         UsingNode: this.transformUsing.bind(this),
         FunctionNode: this.transformFunction.bind(this),
+        CaseNode: this.transformCase.bind(this),
+        WhenNode: this.transformWhen.bind(this),
     });
     transformNode(node) {
         if (!node) {
@@ -404,7 +406,7 @@ class OperationNodeTransformer {
             kind: 'CreateIndexNode',
             name: this.transformNode(node.name),
             table: this.transformNode(node.table),
-            expression: this.transformNode(node.expression),
+            columns: this.transformNodeList(node.columns),
             unique: node.unique,
             using: this.transformNode(node.using),
             ifNotExists: node.ifNotExists,
@@ -653,7 +655,7 @@ class OperationNodeTransformer {
     transformAggregateFunction(node) {
         return (0, require_all_props_js_1.requireAllProps)({
             kind: 'AggregateFunctionNode',
-            aggregated: this.transformNode(node.aggregated),
+            aggregated: this.transformNodeList(node.aggregated),
             distinct: node.distinct,
             filter: this.transformNode(node.filter),
             func: node.func,
@@ -707,6 +709,22 @@ class OperationNodeTransformer {
             arguments: this.transformNodeList(node.arguments),
         });
     }
+    transformCase(node) {
+        return (0, require_all_props_js_1.requireAllProps)({
+            kind: 'CaseNode',
+            value: this.transformNode(node.value),
+            when: this.transformNodeList(node.when),
+            else: this.transformNode(node.else),
+            isStatement: node.isStatement,
+        });
+    }
+    transformWhen(node) {
+        return (0, require_all_props_js_1.requireAllProps)({
+            kind: 'WhenNode',
+            condition: this.transformNode(node.condition),
+            result: this.transformNode(node.result),
+        });
+    }
     transformDataType(node) {
         // An Object.freezed leaf node. No need to clone.
         return node;

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

@@ -78,6 +78,8 @@ import { BinaryOperationNode } from './binary-operation-node.js';
 import { UnaryOperationNode } from './unary-operation-node.js';
 import { UsingNode } from './using-node.js';
 import { FunctionNode } from './function-node.js';
+import { WhenNode } from './when-node.js';
+import { CaseNode } from './case-node.js';
 export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
@@ -162,4 +164,6 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitUnaryOperation(node: UnaryOperationNode): void;
     protected abstract visitUsing(node: UsingNode): void;
     protected abstract visitFunction(node: FunctionNode): void;
+    protected abstract visitCase(node: CaseNode): void;
+    protected abstract visitWhen(node: WhenNode): void;
 }

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

@@ -87,6 +87,8 @@ class OperationNodeVisitor {
         UnaryOperationNode: this.visitUnaryOperation.bind(this),
         UsingNode: this.visitUsing.bind(this),
         FunctionNode: this.visitFunction.bind(this),
+        CaseNode: this.visitCase.bind(this),
+        WhenNode: this.visitWhen.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' | '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' | 'UsingNode' | 'FunctionNode';
+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' | 'UsingNode' | 'FunctionNode' | 'CaseNode' | 'WhenNode';
 export interface OperationNode {
     readonly kind: OperationNodeKind;
 }

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

@@ -0,0 +1,14 @@
+import { OperationNode } from './operation-node.js';
+export interface WhenNode extends OperationNode {
+    readonly kind: 'WhenNode';
+    readonly condition: OperationNode;
+    readonly result?: OperationNode;
+}
+/**
+ * @internal
+ */
+export declare const WhenNode: Readonly<{
+    is(node: OperationNode): node is WhenNode;
+    create(condition: OperationNode): WhenNode;
+    cloneWithResult(whenNode: WhenNode, result: OperationNode): WhenNode;
+}>;

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

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

package/dist/cjs/parser/binary-operation-parser.d.ts

@@ -17,3 +17,4 @@ export declare function parseReferentialComparison(leftOperand: ReferenceExpress
 export declare function parseWhere(args: any[]): OperationNode;
 export declare function parseHaving(args: any[]): OperationNode;
 export declare function parseOn(args: any[]): OperationNode;
+export declare function parseWhen(args: any[]): OperationNode;

package/dist/cjs/parser/binary-operation-parser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseOn = exports.parseHaving = exports.parseWhere = exports.parseReferentialComparison = exports.parseValueComparison = exports.parseReferentialBinaryOperation = exports.parseValueBinaryOperation = void 0;
+exports.parseWhen = exports.parseOn = exports.parseHaving = exports.parseWhere = exports.parseReferentialComparison = exports.parseValueComparison = exports.parseReferentialBinaryOperation = exports.parseValueBinaryOperation = void 0;
 const binary_operation_node_js_1 = require("../operation-node/binary-operation-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
@@ -14,6 +14,8 @@ const parse_utils_js_1 = require("./parse-utils.js");
 const select_query_node_js_1 = require("../operation-node/select-query-node.js");
 const join_node_js_1 = require("../operation-node/join-node.js");
 const expression_builder_js_1 = require("../expression/expression-builder.js");
+const unary_operation_node_js_1 = require("../operation-node/unary-operation-node.js");
+const case_node_js_1 = require("../operation-node/case-node.js");
 function parseValueBinaryOperation(leftOperand, operator, rightOperand) {
     if (!(0, operator_node_js_1.isBinaryOperator)(operator) && !(0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
         throw new Error(`invalid binary operator ${JSON.stringify(operator)}`);
@@ -57,6 +59,10 @@ function parseOn(args) {
     return parseFilter('on', args);
 }
 exports.parseOn = parseOn;
+function parseWhen(args) {
+    return parseFilter('when', args);
+}
+exports.parseWhen = parseWhen;
 function parseFilter(type, args) {
     if (args.length === 3) {
         return parseValueComparison(args[0], args[1], args[2]);
@@ -84,14 +90,24 @@ function parseOperator(operator) {
 }
 function parseOneArgFilterExpression(type, arg) {
     if ((0, object_utils_js_1.isFunction)(arg)) {
+        if (type === 'when') {
+            throw new Error(`when method doesn't accept a callback as an argument`);
+        }
         return CALLBACK_PARSERS[type](arg);
     }
     else if ((0, operation_node_source_js_1.isOperationNodeSource)(arg)) {
         const node = arg.toOperationNode();
-        if (raw_node_js_1.RawNode.is(node)) {
+        if (raw_node_js_1.RawNode.is(node) ||
+            binary_operation_node_js_1.BinaryOperationNode.is(node) ||
+            unary_operation_node_js_1.UnaryOperationNode.is(node) ||
+            parens_node_js_1.ParensNode.is(node) ||
+            case_node_js_1.CaseNode.is(node)) {
             return node;
         }
     }
+    else if (type === 'when') {
+        return value_node_js_1.ValueNode.create(arg);
+    }
     throw createFilterExpressionError(type, arg);
 }
 function createFilterExpressionError(type, args) {

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

@@ -3,7 +3,8 @@ import { AliasNode } from '../operation-node/alias-node.js';
 import { OperationNode } from '../operation-node/operation-node.js';
 import { ExpressionBuilder } from '../expression/expression-builder.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
-export declare type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, Record<string, V>> | SelectQueryBuilderFactory<DB, TB, Record<string, V>> | Expression<V> | ExpressionFactory<DB, TB, V>;
+import { ShallowRecord } from '../util/type-utils.js';
+export declare type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, ShallowRecord<string, V>> | SelectQueryBuilderFactory<DB, TB, ShallowRecord<string, V>> | Expression<V> | ExpressionFactory<DB, TB, V>;
 export declare type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | AliasedExpressionFactory<DB, TB>;
 declare type SelectQueryBuilderFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, V>;
 declare type ExpressionFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => Expression<V>;

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

@@ -2,6 +2,7 @@ import { Expression } from '../expression/expression.js';
 import { OrderByItemNode } from '../operation-node/order-by-item-node.js';
 import { ReferenceExpression } from './reference-parser.js';
 export declare type OrderByDirection = 'asc' | 'desc';
+export declare function isOrderByDirection(thing: unknown): thing is OrderByDirection;
 export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | (keyof O & string);
 export declare type OrderByDirectionExpression = OrderByDirection | Expression<any>;
 export declare function parseOrderBy(orderBy: OrderByExpression<any, any, any>, direction?: OrderByDirectionExpression): OrderByItemNode;

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

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseOrderBy = void 0;
+exports.parseOrderBy = exports.isOrderByDirection = void 0;
 const order_by_item_node_js_1 = require("../operation-node/order-by-item-node.js");
 const raw_node_js_1 = require("../operation-node/raw-node.js");
 const reference_parser_js_1 = require("./reference-parser.js");
+function isOrderByDirection(thing) {
+    return thing === 'asc' || thing === 'desc';
+}
+exports.isOrderByDirection = isOrderByDirection;
 function parseOrderBy(orderBy, direction) {
     return order_by_item_node_js_1.OrderByItemNode.create(parseOrderByExpression(orderBy), parseOrderByDirectionExpression(direction));
 }

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

@@ -1,6 +1,6 @@
 import { AliasNode } from '../operation-node/alias-node.js';
 import { ColumnNode } from '../operation-node/column-node.js';
-import { AnyColumn, AnyColumnWithTable, ExtractColumnType, ValueType } from '../util/type-utils.js';
+import { AnyColumn, AnyColumnWithTable, ExtractColumnType } from '../util/type-utils.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { ExpressionOrFactory } from './expression-parser.js';
 import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
@@ -8,15 +8,19 @@ import { SelectType } from '../util/column-type.js';
 import { OperationNode } from '../operation-node/operation-node.js';
 import { Expression } from '../expression/expression.js';
 import { SimpleReferenceExpressionNode } from '../operation-node/simple-reference-expression-node.js';
+import { OrderByDirection } from './order-by-parser.js';
 export declare type StringReference<DB, TB extends keyof DB> = AnyColumn<DB, TB> | AnyColumnWithTable<DB, TB>;
 export declare type SimpleReferenceExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | DynamicReferenceBuilder<any>;
 export declare type ReferenceExpression<DB, TB extends keyof DB> = SimpleReferenceExpression<DB, TB> | ExpressionOrFactory<DB, TB, any>;
 export declare type ReferenceExpressionOrList<DB, TB extends keyof DB> = ReferenceExpression<DB, TB> | ReadonlyArray<ReferenceExpression<DB, TB>>;
-export declare type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE, DV = unknown> = RE extends string ? SelectType<ExtractTypeFromStringReference<DB, TB, RE>> : RE extends SelectQueryBuilder<any, any, infer O> ? ValueType<O> : RE extends (qb: any) => SelectQueryBuilder<any, any, infer O> ? ValueType<O> : RE extends Expression<infer O> ? O : RE extends (qb: any) => Expression<infer O> ? O : DV;
+export declare type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE, DV = unknown> = RE extends string ? SelectType<ExtractTypeFromStringReference<DB, TB, RE>> : RE extends SelectQueryBuilder<any, any, infer O> ? O[keyof O] | null : RE extends (qb: any) => SelectQueryBuilder<any, any, infer O> ? O[keyof O] | null : RE extends Expression<infer O> ? O : RE extends (qb: any) => Expression<infer O> ? O : DV;
 export declare type ExtractTypeFromStringReference<DB, TB extends keyof DB, RE extends string, DV = unknown> = RE extends `${infer SC}.${infer T}.${infer C}` ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : RE extends `${infer T}.${infer C}` ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : RE extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, RE> : DV;
+export declare type OrderedColumnName<C extends string> = C extends `${string} ${infer O}` ? O extends OrderByDirection ? C : never : C;
+export declare type ExtractColumnNameFromOrderedColumnName<C extends string> = C extends `${infer CL} ${infer O}` ? O extends OrderByDirection ? CL : never : C;
 export declare function parseSimpleReferenceExpression(exp: SimpleReferenceExpression<any, any>): SimpleReferenceExpressionNode;
 export declare function parseReferenceExpressionOrList(arg: ReferenceExpressionOrList<any, any>): OperationNode[];
 export declare function parseReferenceExpression(exp: ReferenceExpression<any, any>): OperationNode;
 export declare function parseStringReference(ref: string): SimpleReferenceExpressionNode;
 export declare function parseAliasedStringReference(ref: string): SimpleReferenceExpressionNode | AliasNode;
 export declare function parseColumnName(column: AnyColumn<any, any>): ColumnNode;
+export declare function parseOrderedColumnName(column: string): OperationNode;

package/dist/cjs/parser/reference-parser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseColumnName = exports.parseAliasedStringReference = exports.parseStringReference = exports.parseReferenceExpression = exports.parseReferenceExpressionOrList = exports.parseSimpleReferenceExpression = void 0;
+exports.parseOrderedColumnName = exports.parseColumnName = exports.parseAliasedStringReference = exports.parseStringReference = exports.parseReferenceExpression = exports.parseReferenceExpressionOrList = exports.parseSimpleReferenceExpression = void 0;
 const alias_node_js_1 = require("../operation-node/alias-node.js");
 const column_node_js_1 = require("../operation-node/column-node.js");
 const reference_node_js_1 = require("../operation-node/reference-node.js");
@@ -8,6 +8,7 @@ const table_node_js_1 = require("../operation-node/table-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const expression_parser_js_1 = require("./expression-parser.js");
 const identifier_node_js_1 = require("../operation-node/identifier-node.js");
+const order_by_parser_js_1 = require("./order-by-parser.js");
 function parseSimpleReferenceExpression(exp) {
     if ((0, object_utils_js_1.isString)(exp)) {
         return parseStringReference(exp);
@@ -65,6 +66,20 @@ function parseColumnName(column) {
     return column_node_js_1.ColumnNode.create(column);
 }
 exports.parseColumnName = parseColumnName;
+function parseOrderedColumnName(column) {
+    const ORDER_SEPARATOR = ' ';
+    if (column.includes(ORDER_SEPARATOR)) {
+        const [columnName, order] = column.split(ORDER_SEPARATOR).map(trim);
+        if (!(0, order_by_parser_js_1.isOrderByDirection)(order)) {
+            throw new Error(`invalid order direction "${order}" next to "${columnName}"`);
+        }
+        return (0, order_by_parser_js_1.parseOrderBy)(columnName, order);
+    }
+    else {
+        return parseColumnName(column);
+    }
+}
+exports.parseOrderedColumnName = parseOrderedColumnName;
 function parseStringReferenceWithTableAndSchema(parts) {
     const [schema, table, column] = parts;
     return reference_node_js_1.ReferenceNode.create(table_node_js_1.TableNode.createWithSchema(schema, table), column_node_js_1.ColumnNode.create(column));

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

@@ -1,6 +1,6 @@
 import { AliasedSelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { SelectionNode } from '../operation-node/selection-node.js';
-import { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, ExtractColumnType, ValueType } from '../util/type-utils.js';
+import { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, DrainOuterGeneric, ExtractColumnType } from '../util/type-utils.js';
 import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
 import { AliasedExpressionOrFactory } from './expression-parser.js';
 import { Selectable, SelectType } from '../util/column-type.js';
@@ -8,12 +8,12 @@ import { AliasedExpression } from '../expression/expression.js';
 import { ExpressionBuilder } from '../expression/expression-builder.js';
 export declare type SelectExpression<DB, TB extends keyof DB> = AnyAliasedColumnWithTable<DB, TB> | AnyAliasedColumn<DB, TB> | AnyColumnWithTable<DB, TB> | AnyColumn<DB, TB> | DynamicReferenceBuilder<any> | AliasedExpressionOrFactory<DB, TB>;
 export declare type SelectArg<DB, TB extends keyof DB, SE extends SelectExpression<DB, TB>> = SE | ReadonlyArray<SE> | ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<SE>);
-export declare type Selection<DB, TB extends keyof DB, SE> = {
+export declare type Selection<DB, TB extends keyof DB, SE> = DrainOuterGeneric<{
     [A in ExtractAliasFromSelectExpression<SE>]: SelectType<ExtractTypeFromSelectExpression<DB, TB, SE, A>>;
-};
+}>;
 declare type ExtractAliasFromSelectExpression<SE> = SE extends string ? ExtractAliasFromStringSelectExpression<SE> : SE extends AliasedExpression<any, infer EA> ? EA : SE extends (qb: any) => AliasedExpression<any, infer EA> ? EA : SE extends DynamicReferenceBuilder<infer RA> ? ExtractAliasFromStringSelectExpression<RA> : never;
 declare type ExtractAliasFromStringSelectExpression<SE extends string> = SE extends `${string}.${string}.${string} as ${infer A}` ? A : SE extends `${string}.${string} as ${infer A}` ? A : SE extends `${string} as ${infer A}` ? A : SE extends `${string}.${string}.${infer C}` ? C : SE extends `${string}.${infer C}` ? C : SE;
-declare type ExtractTypeFromSelectExpression<DB, TB extends keyof DB, SE, A extends keyof any> = SE extends string ? ExtractTypeFromStringSelectExpression<DB, TB, SE, A> : SE extends AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends (qb: any) => AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends (qb: any) => AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends DynamicReferenceBuilder<infer RA> ? A extends ExtractAliasFromStringSelectExpression<RA> ? ExtractTypeFromStringSelectExpression<DB, TB, RA, A> | undefined : never : never;
+declare type ExtractTypeFromSelectExpression<DB, TB extends keyof DB, SE, A extends keyof any> = SE extends string ? ExtractTypeFromStringSelectExpression<DB, TB, SE, A> : SE extends AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O[keyof O] | null : never : SE extends (qb: any) => AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O[keyof O] | null : never : SE extends AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends (qb: any) => AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends DynamicReferenceBuilder<infer RA> ? A extends ExtractAliasFromStringSelectExpression<RA> ? ExtractTypeFromStringSelectExpression<DB, TB, RA, A> | undefined : never : never;
 declare type ExtractTypeFromStringSelectExpression<DB, TB extends keyof DB, SE extends string, A extends keyof any> = SE extends `${infer SC}.${infer T}.${infer C} as ${infer RA}` ? RA extends A ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : never : SE extends `${infer T}.${infer C} as ${infer RA}` ? RA extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : SE extends `${infer C} as ${infer RA}` ? RA extends A ? C extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, C> : never : never : SE extends `${infer SC}.${infer T}.${infer C}` ? C extends A ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : never : SE extends `${infer T}.${infer C}` ? C extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : SE extends A ? SE extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, SE> : never : never;
 export declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
     [C in AnyColumn<DB, TB>]: {

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

@@ -3,17 +3,18 @@ import { TableNode } from '../operation-node/table-node.js';
 import { AliasedExpressionOrFactory } from './expression-parser.js';
 import { OperationNode } from '../operation-node/operation-node.js';
 import { AliasedExpression } from '../expression/expression.js';
+import { DrainOuterGeneric, ShallowRecord } from '../util/type-utils.js';
 export declare type TableExpression<DB, TB extends keyof DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpressionOrFactory<DB, TB>;
 export declare type TableExpressionOrList<DB, TB extends keyof DB> = TableExpression<DB, TB> | ReadonlyArray<TableExpression<DB, TB>>;
 export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpression<any, any>;
 export declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
 export declare type TableReferenceOrList<DB> = TableReference<DB> | ReadonlyArray<TableReference<DB>>;
-export declare type From<DB, TE> = {
+export declare type From<DB, TE> = DrainOuterGeneric<{
     [C in keyof DB | ExtractAliasFromTableExpression<DB, TE>]: C extends ExtractAliasFromTableExpression<DB, TE> ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? DB[C] : never;
-};
-export declare type FromTables<DB, TB extends keyof DB, TE> = TB | ExtractAliasFromTableExpression<DB, TE>;
+}>;
+export declare type FromTables<DB, TB extends keyof DB, TE> = DrainOuterGeneric<TB | ExtractAliasFromTableExpression<DB, TE>>;
 export declare type ExtractTableAlias<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : never;
-export declare type PickTableWithAlias<DB, T extends AnyAliasedTable<DB>> = T extends `${infer TB} as ${infer A}` ? TB extends keyof DB ? Record<A, DB[TB]> : never : never;
+export declare type PickTableWithAlias<DB, T extends AnyAliasedTable<DB>> = T extends `${infer TB} as ${infer A}` ? TB extends keyof DB ? ShallowRecord<A, DB[TB]> : never : never;
 declare type ExtractAliasFromTableExpression<DB, TE> = TE extends string ? ExtractTableAlias<DB, TE> : TE extends AliasedExpression<any, infer QA> ? QA : TE extends (qb: any) => AliasedExpression<any, infer QA> ? QA : never;
 declare type ExtractRowTypeFromTableExpression<DB, TE, A extends keyof any> = TE extends `${infer T} as ${infer TA}` ? TA extends A ? T extends keyof DB ? DB[T] : never : never : TE extends A ? TE extends keyof DB ? DB[TE] : never : TE extends AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : never;
 declare type AnyTable<DB> = keyof DB & string;

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

@@ -4,9 +4,10 @@ import { InsertQueryBuilder } from '../query-builder/insert-query-builder.js';
 import { CommonTableExpressionNode } from '../operation-node/common-table-expression-node.js';
 import { QueryCreator } from '../query-creator.js';
 import { Expression } from '../expression/expression.js';
+import { ShallowRecord } from '../util/type-utils.js';
 export declare type CommonTableExpression<DB, CN extends string> = (creator: QueryCreator<DB>) => CommonTableExpressionOutput<DB, CN>;
-export declare type RecursiveCommonTableExpression<DB, CN extends string> = (creator: QueryCreator<DB & Record<ExtractTableFromCommonTableExpressionName<CN>, ExtractRowFromCommonTableExpressionName<CN>>>) => CommonTableExpressionOutput<DB, CN>;
-export declare type QueryCreatorWithCommonTableExpression<DB, CN extends string, CTE> = QueryCreator<DB & Record<ExtractTableFromCommonTableExpressionName<CN>, ExtractRowFromCommonTableExpression<CTE>>>;
+export declare type RecursiveCommonTableExpression<DB, CN extends string> = (creator: QueryCreator<DB & ShallowRecord<ExtractTableFromCommonTableExpressionName<CN>, ExtractRowFromCommonTableExpressionName<CN>>>) => CommonTableExpressionOutput<DB, CN>;
+export declare type QueryCreatorWithCommonTableExpression<DB, CN extends string, CTE> = QueryCreator<DB & ShallowRecord<ExtractTableFromCommonTableExpressionName<CN>, ExtractRowFromCommonTableExpression<CTE>>>;
 declare type CommonTableExpressionOutput<DB, CN extends string> = Expression<ExtractRowFromCommonTableExpressionName<CN>> | InsertQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>> | UpdateQueryBuilder<DB, any, any, ExtractRowFromCommonTableExpressionName<CN>> | DeleteQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>>;
 /**
  * Given a common CommonTableExpression CTE extracts the row type from it.
@@ -30,7 +31,7 @@ declare type ExtractTableFromCommonTableExpressionName<CN extends string> = CN e
  */
 declare type ExtractRowFromCommonTableExpressionName<CN extends string> = CN extends `${string}(${infer CL})` ? {
     [C in ExtractColumnNamesFromColumnList<CL>]: any;
-} : Record<string, any>;
+} : ShallowRecord<string, any>;
 /**
  * Parses a string like 'id, first_name' into a type 'id' | 'first_name'
  */

package/dist/cjs/query-builder/case-builder.d.ts

@@ -0,0 +1,111 @@
+import { Expression } from '../expression/expression.js';
+import { ExpressionWrapper } from '../expression/expression-wrapper.js';
+import { ReferenceExpression } from '../parser/reference-parser.js';
+import { CaseNode } from '../operation-node/case-node.js';
+import { ComparisonOperatorExpression, OperandValueExpressionOrList } from '../parser/binary-operation-parser.js';
+import { KyselyTypeError } from '../util/type-error.js';
+export declare class CaseBuilder<DB, TB extends keyof DB, W = unknown, O = never> implements Whenable<DB, TB, W, O> {
+    #private;
+    constructor(props: CaseBuilderProps);
+    /**
+     * Adds a `when` clause to the case statement.
+     *
+     * A `when` call must be followed by a {@link CaseThenBuilder.then} call.
+     */
+    when<RE extends ReferenceExpression<DB, TB>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): CaseThenBuilder<DB, TB, W, O>;
+    when(expression: Expression<W>): CaseThenBuilder<DB, TB, W, O>;
+    when(value: unknown extends W ? KyselyTypeError<'when(value) is only supported when using case(value)'> : W): CaseThenBuilder<DB, TB, W, O>;
+}
+interface CaseBuilderProps {
+    readonly node: CaseNode;
+}
+export declare class CaseThenBuilder<DB, TB extends keyof DB, W, O> {
+    #private;
+    constructor(props: CaseBuilderProps);
+    /**
+     * Adds a `then` clause to the `case` statement.
+     *
+     * A `then` call can be followed by {@link Whenable.when}, {@link CaseWhenBuilder.else},
+     * {@link CaseWhenBuilder.end} or {@link CaseWhenBuilder.endCase} call.
+     */
+    then<O2>(expression: Expression<O2>): CaseWhenBuilder<DB, TB, W, O | O2>;
+    then<V>(value: V): CaseWhenBuilder<DB, TB, W, O | V>;
+}
+export declare class CaseWhenBuilder<DB, TB extends keyof DB, W, O> implements Whenable<DB, TB, W, O>, Endable<O | null> {
+    #private;
+    constructor(props: CaseBuilderProps);
+    /**
+     * Adds a `when` clause to the case statement.
+     *
+     * A `when` call must be followed by a {@link CaseThenBuilder.then} call.
+     */
+    when<RE extends ReferenceExpression<DB, TB>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): CaseThenBuilder<DB, TB, W, O>;
+    when(expression: Expression<W>): CaseThenBuilder<DB, TB, W, O>;
+    when(value: unknown extends W ? KyselyTypeError<'when(value) is only supported when using case(value)'> : W): CaseThenBuilder<DB, TB, W, O>;
+    /**
+     * Adds an `else` clause to the `case` statement.
+     *
+     * An `else` call must be followed by an {@link Endable.end} or {@link Endable.endCase} call.
+     */
+    else<O2>(expression: Expression<O2>): CaseEndBuilder<O | O2>;
+    else<V>(value: V): CaseEndBuilder<O | V>;
+    /**
+     * Adds an `end` keyword to the case operator.
+     *
+     * `case` operators can only be used as part of a query.
+     * For a `case` statement used as part of a stored program, use {@link endCase} instead.
+     */
+    end(): ExpressionWrapper<O | null>;
+    /**
+     * Adds `end case` keywords to the case statement.
+     *
+     * `case` statements can only be used for flow control in stored programs.
+     * For a `case` operator used as part of a query, use {@link end} instead.
+     */
+    endCase(): ExpressionWrapper<O | null>;
+}
+export declare class CaseEndBuilder<O> implements Endable<O> {
+    #private;
+    constructor(props: CaseBuilderProps);
+    /**
+     * Adds an `end` keyword to the case operator.
+     *
+     * `case` operators can only be used as part of a query.
+     * For a `case` statement used as part of a stored program, use {@link endCase} instead.
+     */
+    end(): ExpressionWrapper<O>;
+    /**
+     * Adds `end case` keywords to the case statement.
+     *
+     * `case` statements can only be used for flow control in stored programs.
+     * For a `case` operator used as part of a query, use {@link end} instead.
+     */
+    endCase(): ExpressionWrapper<O>;
+}
+interface Whenable<DB, TB extends keyof DB, W, O> {
+    /**
+     * Adds a `when` clause to the case statement.
+     *
+     * A `when` call must be followed by a {@link CaseThenBuilder.then} call.
+     */
+    when<RE extends ReferenceExpression<DB, TB>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): CaseThenBuilder<DB, TB, W, O>;
+    when(expression: Expression<W>): CaseThenBuilder<DB, TB, W, O>;
+    when(value: unknown extends W ? KyselyTypeError<'when(value) is only supported when using case(value)'> : W): CaseThenBuilder<DB, TB, W, O>;
+}
+interface Endable<O> {
+    /**
+     * Adds an `end` keyword to the case operator.
+     *
+     * `case` operators can only be used as part of a query.
+     * For a `case` statement used as part of a stored program, use {@link endCase} instead.
+     */
+    end(): ExpressionWrapper<O>;
+    /**
+     * Adds `end case` keywords to the case statement.
+     *
+     * `case` statements can only be used for flow control in stored programs.
+     * For a `case` operator used as part of a query, use {@link end} instead.
+     */
+    endCase(): ExpressionWrapper<O>;
+}
+export {};

package/dist/cjs/query-builder/case-builder.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CaseEndBuilder = exports.CaseWhenBuilder = exports.CaseThenBuilder = exports.CaseBuilder = void 0;
+const expression_wrapper_js_1 = require("../expression/expression-wrapper.js");
+const object_utils_js_1 = require("../util/object-utils.js");
+const case_node_js_1 = require("../operation-node/case-node.js");
+const when_node_js_1 = require("../operation-node/when-node.js");
+const binary_operation_parser_js_1 = require("../parser/binary-operation-parser.js");
+const value_parser_js_1 = require("../parser/value-parser.js");
+class CaseBuilder {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
+    }
+    when(...args) {
+        return new CaseThenBuilder({
+            ...this.#props,
+            node: case_node_js_1.CaseNode.cloneWithWhen(this.#props.node, when_node_js_1.WhenNode.create((0, binary_operation_parser_js_1.parseWhen)(args))),
+        });
+    }
+}
+exports.CaseBuilder = CaseBuilder;
+class CaseThenBuilder {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
+    }
+    then(valueExpression) {
+        return new CaseWhenBuilder({
+            ...this.#props,
+            node: case_node_js_1.CaseNode.cloneWithThen(this.#props.node, (0, value_parser_js_1.parseValueExpression)(valueExpression)),
+        });
+    }
+}
+exports.CaseThenBuilder = CaseThenBuilder;
+class CaseWhenBuilder {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
+    }
+    when(...args) {
+        return new CaseThenBuilder({
+            ...this.#props,
+            node: case_node_js_1.CaseNode.cloneWithWhen(this.#props.node, when_node_js_1.WhenNode.create((0, binary_operation_parser_js_1.parseWhen)(args))),
+        });
+    }
+    else(valueExpression) {
+        return new CaseEndBuilder({
+            ...this.#props,
+            node: case_node_js_1.CaseNode.cloneWith(this.#props.node, {
+                else: (0, value_parser_js_1.parseValueExpression)(valueExpression),
+            }),
+        });
+    }
+    end() {
+        return new expression_wrapper_js_1.ExpressionWrapper(case_node_js_1.CaseNode.cloneWith(this.#props.node, { isStatement: false }));
+    }
+    endCase() {
+        return new expression_wrapper_js_1.ExpressionWrapper(case_node_js_1.CaseNode.cloneWith(this.#props.node, { isStatement: true }));
+    }
+}
+exports.CaseWhenBuilder = CaseWhenBuilder;
+class CaseEndBuilder {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
+    }
+    end() {
+        return new expression_wrapper_js_1.ExpressionWrapper(case_node_js_1.CaseNode.cloneWith(this.#props.node, { isStatement: false }));
+    }
+    endCase() {
+        return new expression_wrapper_js_1.ExpressionWrapper(case_node_js_1.CaseNode.cloneWith(this.#props.node, { isStatement: true }));
+    }
+}
+exports.CaseEndBuilder = CaseEndBuilder;