kysely 0.21.6 → 0.23.0

package/dist/esm/operation-node/value-list-node.d.ts

@@ -1,18 +1,12 @@
-import { DefaultInsertValueNode } from './default-insert-value-node.js';
 import { OperationNode } from './operation-node.js';
-import { RawNode } from './raw-node.js';
-import { ReferenceNode } from './reference-node.js';
-import { SelectQueryNode } from './select-query-node.js';
-import { ValueNode } from './value-node.js';
-export declare type ListNodeItem = ValueNode | ReferenceNode | DefaultInsertValueNode | SelectQueryNode | RawNode;
 export interface ValueListNode extends OperationNode {
     readonly kind: 'ValueListNode';
-    readonly values: ReadonlyArray<ListNodeItem>;
+    readonly values: ReadonlyArray<OperationNode>;
 }
 /**
  * @internal
  */
 export declare const ValueListNode: Readonly<{
     is(node: OperationNode): node is ValueListNode;
-    create(values: ReadonlyArray<ListNodeItem>): ValueListNode;
+    create(values: ReadonlyArray<OperationNode>): ValueListNode;
 }>;

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

@@ -1,14 +1,13 @@
-import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
 export interface WhereNode extends OperationNode {
     readonly kind: 'WhereNode';
-    readonly where: FilterExpressionNode;
+    readonly where: OperationNode;
 }
 /**
  * @internal
  */
 export declare const WhereNode: Readonly<{
     is(node: OperationNode): node is WhereNode;
-    create(filter: FilterExpressionNode): WhereNode;
-    cloneWithFilter(whereNode: WhereNode, op: 'And' | 'Or', filter: FilterExpressionNode): WhereNode;
+    create(filter: OperationNode): WhereNode;
+    cloneWithOperation(whereNode: WhereNode, operator: 'And' | 'Or', operation: OperationNode): WhereNode;
 }>;

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

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

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

@@ -0,0 +1,20 @@
+import { BinaryOperationNode } from '../operation-node/binary-operation-node.js';
+import { ComparisonOperator } from '../operation-node/operator-node.js';
+import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
+import { ValueExpression, ValueExpressionOrList } from './value-parser.js';
+import { WhereInterface } from '../query-builder/where-interface.js';
+import { HavingInterface } from '../query-builder/having-interface.js';
+import { OperationNode } from '../operation-node/operation-node.js';
+import { Expression } from '../expression/expression.js';
+export declare type OperandValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
+export declare type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
+export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
+export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
+export declare type ComparisonOperatorExpression = ComparisonOperator | Expression<any>;
+declare type FilterExpressionType = 'where' | 'having' | 'on';
+export declare function parseWhere(args: any[]): OperationNode;
+export declare function parseHaving(args: any[]): OperationNode;
+export declare function parseOn(args: any[]): OperationNode;
+export declare function parseReferentialFilter(leftOperand: ReferenceExpression<any, any>, operator: ComparisonOperatorExpression, rightOperand: ReferenceExpression<any, any>): BinaryOperationNode;
+export declare function parseFilterExpression(type: FilterExpressionType, args: any[]): OperationNode;
+export {};

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

@@ -0,0 +1,92 @@
+/// <reference types="./binary-operation-parser.d.ts" />
+import { BinaryOperationNode } from '../operation-node/binary-operation-node.js';
+import { freeze, isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
+import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
+import { RawNode } from '../operation-node/raw-node.js';
+import { OperatorNode, COMPARISON_OPERATORS, } from '../operation-node/operator-node.js';
+import { ParensNode } from '../operation-node/parens-node.js';
+import { parseReferenceExpression, } from './reference-parser.js';
+import { parseValueExpressionOrList, } from './value-parser.js';
+import { ValueNode } from '../operation-node/value-node.js';
+import { createJoinBuilder, createSelectQueryBuilder } from './parse-utils.js';
+export function parseWhere(args) {
+    return parseFilterExpression('where', args);
+}
+export function parseHaving(args) {
+    return parseFilterExpression('having', args);
+}
+export function parseOn(args) {
+    return parseFilterExpression('on', args);
+}
+export function parseReferentialFilter(leftOperand, operator, rightOperand) {
+    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseComparisonOperatorExpression(operator), parseReferenceExpression(rightOperand));
+}
+export function parseFilterExpression(type, args) {
+    if (args.length === 3) {
+        return parseFilter(args[0], args[1], args[2]);
+    }
+    if (args.length === 1) {
+        return parseOneArgFilterExpression(type, args[0]);
+    }
+    throw createFilterExpressionError(type, args);
+}
+function parseFilter(leftOperand, operator, rightOperand) {
+    if ((operator === 'is' || operator === 'is not') &&
+        (isNull(rightOperand) || isBoolean(rightOperand))) {
+        return parseIs(leftOperand, operator, rightOperand);
+    }
+    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseComparisonOperatorExpression(operator), parseValueExpressionOrList(rightOperand));
+}
+function parseIs(leftOperand, operator, rightOperand) {
+    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseComparisonOperatorExpression(operator), ValueNode.createImmediate(rightOperand));
+}
+function parseComparisonOperatorExpression(operator) {
+    if (isString(operator) && COMPARISON_OPERATORS.includes(operator)) {
+        return OperatorNode.create(operator);
+    }
+    else if (isOperationNodeSource(operator)) {
+        return operator.toOperationNode();
+    }
+    throw new Error(`invalid comparison operator ${JSON.stringify(operator)} passed to a filter method`);
+}
+function parseOneArgFilterExpression(type, arg) {
+    if (isFunction(arg)) {
+        return GROUP_PARSERS[type](arg);
+    }
+    else if (isOperationNodeSource(arg)) {
+        const node = arg.toOperationNode();
+        if (RawNode.is(node)) {
+            return node;
+        }
+    }
+    throw createFilterExpressionError(type, arg);
+}
+function createFilterExpressionError(type, args) {
+    return new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
+}
+const GROUP_PARSERS = freeze({
+    where(callback) {
+        const query = callback(createSelectQueryBuilder());
+        const queryNode = query.toOperationNode();
+        if (!queryNode.where) {
+            throw new Error('no `where` methods called inside a group callback');
+        }
+        return ParensNode.create(queryNode.where.where);
+    },
+    having(callback) {
+        const query = callback(createSelectQueryBuilder());
+        const queryNode = query.toOperationNode();
+        if (!queryNode.having) {
+            throw new Error('no `having` methods called inside a group callback');
+        }
+        return ParensNode.create(queryNode.having.having);
+    },
+    on(callback) {
+        const joinBuilder = callback(createJoinBuilder('InnerJoin', 'table'));
+        const joinNode = joinBuilder.toOperationNode();
+        if (!joinNode.on) {
+            throw new Error('no `on` methods called inside a group callback');
+        }
+        return ParensNode.create(joinNode.on.on);
+    },
+});

package/dist/esm/parser/coalesce-parser.d.ts

@@ -0,0 +1,4 @@
+import { RawNode } from '../operation-node/raw-node.js';
+import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
+export declare type CoalesceReferenceExpressionList<DB, TB extends keyof DB, RE extends unknown[], O = never> = RE extends [] ? O : RE extends [infer L, ...infer R] ? L extends ReferenceExpression<any, any> ? null extends ExtractTypeFromReferenceExpression<DB, TB, L> ? CoalesceReferenceExpressionList<DB, TB, R extends ReferenceExpression<any, any>[] ? R : never, O | ExtractTypeFromReferenceExpression<DB, TB, L>> : Exclude<O, null> | ExtractTypeFromReferenceExpression<DB, TB, L> : never : never;
+export declare function parseCoalesce(values: ReferenceExpression<any, any>[]): RawNode;

package/dist/esm/parser/coalesce-parser.js

@@ -0,0 +1,8 @@
+/// <reference types="./coalesce-parser.d.ts" />
+import { RawNode } from '../operation-node/raw-node.js';
+import { parseReferenceExpressionOrList, } from './reference-parser.js';
+export function parseCoalesce(values) {
+    return RawNode.create(values.length > 1
+        ? ['coalesce(', ...new Array(values.length - 1).fill(', '), ')']
+        : ['coalesce(', ')'], parseReferenceExpressionOrList(values));
+}

package/dist/esm/parser/data-type-parser.d.ts

@@ -1,5 +1,5 @@
-import { ColumnDataType, DataTypeNode } from '../operation-node/data-type-node.js';
-import { RawNode } from '../operation-node/raw-node.js';
-import { AnyRawBuilder } from '../util/type-utils.js';
-export declare type DataTypeExpression = ColumnDataType | AnyRawBuilder;
-export declare function parseDataTypeExpression(dataType: DataTypeExpression): DataTypeNode | RawNode;
+import { Expression } from '../expression/expression.js';
+import { ColumnDataType } from '../operation-node/data-type-node.js';
+import { OperationNode } from '../operation-node/operation-node.js';
+export declare type DataTypeExpression = ColumnDataType | Expression<any>;
+export declare function parseDataTypeExpression(dataType: DataTypeExpression): OperationNode;

package/dist/esm/parser/default-value-parser.d.ts

@@ -1,5 +1,4 @@
-import { RawNode } from '../operation-node/raw-node.js';
-import { ValueNode } from '../operation-node/value-node.js';
-import { RawBuilder } from '../raw-builder/raw-builder.js';
-export declare type DefaultValueExpression = unknown | RawBuilder;
-export declare function parseDefaultValueExpression(value: DefaultValueExpression): ValueNode | RawNode;
+import { Expression } from '../expression/expression.js';
+import { OperationNode } from '../operation-node/operation-node.js';
+export declare type DefaultValueExpression = unknown | Expression<unknown>;
+export declare function parseDefaultValueExpression(value: DefaultValueExpression): OperationNode;

package/dist/esm/parser/default-value-parser.js

@@ -1,8 +1,8 @@
 /// <reference types="./default-value-parser.d.ts" />
+import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
 import { ValueNode } from '../operation-node/value-node.js';
-import { RawBuilder } from '../raw-builder/raw-builder.js';
 export function parseDefaultValueExpression(value) {
-    return value instanceof RawBuilder
+    return isOperationNodeSource(value)
         ? value.toOperationNode()
         : ValueNode.createImmediate(value);
 }

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

@@ -0,0 +1,10 @@
+import { AliasedExpression, Expression } from '../expression/expression.js';
+import { AliasNode } from '../operation-node/alias-node.js';
+import { OperationNode } from '../operation-node/operation-node.js';
+import { ExpressionBuilder } from '../query-builder/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>> | ((eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, Record<string, V>>) | Expression<V> | ((eb: ExpressionBuilder<DB, TB>) => Expression<V>);
+export declare type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | ((qb: ExpressionBuilder<DB, TB>) => AliasedExpression<any, any>);
+export declare function parseExpression(exp: ExpressionOrFactory<any, any, any>): OperationNode;
+export declare function parseAliasedExpression(exp: AliasedExpressionOrFactory<any, any>): AliasNode;
+export declare function isExpressionOrFactory(obj: unknown): obj is ExpressionOrFactory<any, any, any>;

package/dist/esm/parser/{complex-expression-parser.js → expression-parser.js}

@@ -1,8 +1,9 @@
-/// <reference types="./complex-expression-parser.d.ts" />
+/// <reference types="./expression-parser.d.ts" />
+import { isExpression, } from '../expression/expression.js';
 import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
 import { isFunction } from '../util/object-utils.js';
 import { createExpressionBuilder } from './parse-utils.js';
-export function parseComplexExpression(exp) {
+export function parseExpression(exp) {
     if (isOperationNodeSource(exp)) {
         return exp.toOperationNode();
     }
@@ -11,7 +12,7 @@ export function parseComplexExpression(exp) {
     }
     throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
 }
-export function parseAliasedComplexExpression(exp) {
+export function parseAliasedExpression(exp) {
     if (isOperationNodeSource(exp)) {
         return exp.toOperationNode();
     }
@@ -20,6 +21,6 @@ export function parseAliasedComplexExpression(exp) {
     }
     throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
 }
-export function isComplexExpression(obj) {
-    return isOperationNodeSource(obj) || isFunction(obj);
+export function isExpressionOrFactory(obj) {
+    return isExpression(obj) || isFunction(obj);
 }

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

@@ -2,4 +2,4 @@ import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
 import { ReferenceExpression } from './reference-parser.js';
 export declare type GroupByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | (keyof O & string);
 export declare type GroupByExpressionOrList<DB, TB extends keyof DB, O> = ReadonlyArray<GroupByExpression<DB, TB, O>> | GroupByExpression<DB, TB, O>;
-export declare function parseGroupBy(orderBy: GroupByExpressionOrList<any, any, any>): GroupByItemNode[];
+export declare function parseGroupBy(groupBy: GroupByExpressionOrList<any, any, any>): GroupByItemNode[];

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

@@ -1,6 +1,6 @@
 /// <reference types="./group-by-parser.d.ts" />
 import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
 import { parseReferenceExpressionOrList, } from './reference-parser.js';
-export function parseGroupBy(orderBy) {
-    return parseReferenceExpressionOrList(orderBy).map(GroupByItemNode.create);
+export function parseGroupBy(groupBy) {
+    return parseReferenceExpressionOrList(groupBy).map(GroupByItemNode.create);
 }

package/dist/esm/parser/identifier-parser.d.ts

@@ -0,0 +1,2 @@
+import { SchemableIdentifierNode } from '../operation-node/schemable-identifier-node.js';
+export declare function parseSchemableIdentifier(id: string): SchemableIdentifierNode;

package/dist/esm/parser/identifier-parser.js

@@ -0,0 +1,20 @@
+/// <reference types="./identifier-parser.d.ts" />
+import { SchemableIdentifierNode } from '../operation-node/schemable-identifier-node.js';
+export function parseSchemableIdentifier(id) {
+    const SCHEMA_SEPARATOR = '.';
+    if (id.includes(SCHEMA_SEPARATOR)) {
+        const parts = id.split(SCHEMA_SEPARATOR).map(trim);
+        if (parts.length === 2) {
+            return SchemableIdentifierNode.createWithSchema(parts[0], parts[1]);
+        }
+        else {
+            throw new Error(`invalid schemable identifier ${id}`);
+        }
+    }
+    else {
+        return SchemableIdentifierNode.create(id);
+    }
+}
+function trim(str) {
+    return str.trim();
+}

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

@@ -5,7 +5,7 @@ import { NonNullableInsertKeys, NullableInsertKeys, InsertType } from '../util/c
 export declare type InsertObject<DB, TB extends keyof DB> = {
     [C in NonNullableInsertKeys<DB[TB]>]: ValueExpression<DB, TB, InsertType<DB[TB][C]>>;
 } & {
-    [C in NullableInsertKeys<DB[TB]>]?: ValueExpression<DB, TB, InsertType<DB[TB][C]>>;
+    [C in NullableInsertKeys<DB[TB]>]?: ValueExpression<DB, TB, InsertType<DB[TB][C]>> | undefined;
 };
 export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
 export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];

package/dist/esm/parser/insert-values-parser.js

@@ -5,7 +5,7 @@ import { ValueListNode } from '../operation-node/value-list-node.js';
 import { freeze, isUndefined } from '../util/object-utils.js';
 import { parseValueExpression } from './value-parser.js';
 import { ValuesNode } from '../operation-node/values-node.js';
-import { isComplexExpression } from './complex-expression-parser.js';
+import { isExpressionOrFactory } from './expression-parser.js';
 import { DefaultInsertValueNode } from '../operation-node/default-insert-value-node.js';
 export function parseInsertObjectOrList(args) {
     return parseInsertColumnsAndValues(Array.isArray(args) ? args : [args]);
@@ -39,7 +39,7 @@ function parseRowValues(row, columns) {
         const columnIdx = columns.get(col);
         if (columnIdx !== undefined) {
             const value = row[col];
-            if (isComplexExpression(value)) {
+            if (isExpressionOrFactory(value)) {
                 complexColumn = true;
             }
             rowValues[columnIdx] = value;

package/dist/esm/parser/join-parser.js

@@ -1,7 +1,7 @@
 /// <reference types="./join-parser.d.ts" />
 import { JoinNode } from '../operation-node/join-node.js';
 import { parseTableExpression, } from './table-parser.js';
-import { parseReferenceFilter } from './filter-parser.js';
+import { parseReferentialFilter } from './binary-operation-parser.js';
 import { createJoinBuilder } from './parse-utils.js';
 export function parseJoin(joinType, args) {
     if (args.length === 3) {
@@ -19,5 +19,5 @@ function parseCallbackJoin(joinType, from, callback) {
     return joinBuilder.toOperationNode();
 }
 function parseSingleOnJoin(joinType, from, lhsColumn, rhsColumn) {
-    return JoinNode.createWithOn(joinType, parseTableExpression(from), parseReferenceFilter(lhsColumn, '=', rhsColumn));
+    return JoinNode.createWithOn(joinType, parseTableExpression(from), parseReferentialFilter(lhsColumn, '=', rhsColumn));
 }

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

@@ -1,7 +1,7 @@
+import { Expression } from '../expression/expression.js';
 import { OrderByItemNode } from '../operation-node/order-by-item-node.js';
-import { AnyRawBuilder } from '../util/type-utils.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 & string);
-export declare type OrderByDirectionExpression = OrderByDirection | AnyRawBuilder;
+export declare type OrderByDirectionExpression = OrderByDirection | Expression<any>;
 export declare function parseOrderBy(orderBy: OrderByExpression<any, any, any>, direction?: OrderByDirectionExpression): OrderByItemNode;

package/dist/esm/parser/parse-utils.d.ts

@@ -1,6 +1,7 @@
 import { JoinType } from '../operation-node/join-node.js';
 import { ExpressionBuilder } from '../query-builder/expression-builder.js';
 import { JoinBuilder } from '../query-builder/join-builder.js';
+import { OverBuilder } from '../query-builder/over-builder.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { QueryCreator } from '../query-creator.js';
 import { TableExpression } from './table-parser.js';
@@ -8,3 +9,4 @@ export declare function createSelectQueryBuilder(): SelectQueryBuilder<any, any,
 export declare function createExpressionBuilder(): ExpressionBuilder<any, any>;
 export declare function createQueryCreator(): QueryCreator<any>;
 export declare function createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
+export declare function createOverBuilder(): OverBuilder<any, any>;

package/dist/esm/parser/parse-utils.js

@@ -1,8 +1,10 @@
 /// <reference types="./parse-utils.d.ts" />
 import { JoinNode } from '../operation-node/join-node.js';
+import { OverNode } from '../operation-node/over-node.js';
 import { SelectQueryNode } from '../operation-node/select-query-node.js';
 import { ExpressionBuilder } from '../query-builder/expression-builder.js';
 import { JoinBuilder } from '../query-builder/join-builder.js';
+import { OverBuilder } from '../query-builder/over-builder.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { QueryCreator } from '../query-creator.js';
 import { NOOP_QUERY_EXECUTOR } from '../query-executor/noop-query-executor.js';
@@ -30,3 +32,8 @@ export function createJoinBuilder(joinType, table) {
         joinNode: JoinNode.create(joinType, parseTableExpression(table)),
     });
 }
+export function createOverBuilder() {
+    return new OverBuilder({
+        overNode: OverNode.create(),
+    });
+}

package/dist/esm/parser/partition-by-parser.d.ts

@@ -0,0 +1,6 @@
+import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
+import { PartitionByItemNode } from '../operation-node/partition-by-item-node.js';
+import { StringReference } from './reference-parser.js';
+export declare type PartitionByExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | DynamicReferenceBuilder<any>;
+export declare type PartitionByExpressionOrList<DB, TB extends keyof DB> = ReadonlyArray<PartitionByExpression<DB, TB>> | PartitionByExpression<DB, TB>;
+export declare function parsePartitionBy(partitionBy: PartitionByExpressionOrList<any, any>): PartitionByItemNode[];

package/dist/esm/parser/partition-by-parser.js

@@ -0,0 +1,6 @@
+/// <reference types="./partition-by-parser.d.ts" />
+import { PartitionByItemNode } from '../operation-node/partition-by-item-node.js';
+import { parseReferenceExpressionOrList, } from './reference-parser.js';
+export function parsePartitionBy(partitionBy) {
+    return parseReferenceExpressionOrList(partitionBy).map(PartitionByItemNode.create);
+}

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

@@ -1,21 +1,22 @@
 import { AliasNode } from '../operation-node/alias-node.js';
 import { ColumnNode } from '../operation-node/column-node.js';
-import { ReferenceExpressionNode } from '../operation-node/operation-node-utils.js';
-import { ReferenceNode } from '../operation-node/reference-node.js';
 import { AnyColumn, AnyColumnWithTable, ExtractColumnType, ValueType } from '../util/type-utils.js';
-import { RawBuilder } from '../raw-builder/raw-builder.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
-import { ComplexExpression } from './complex-expression-parser.js';
+import { ExpressionOrFactory } from './expression-parser.js';
 import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
 import { SelectType } from '../util/column-type.js';
-export declare type ReferenceExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | DynamicReferenceBuilder<any> | ComplexExpression<DB, TB>;
-export declare type ReferenceExpressionOrList<DB, TB extends keyof DB> = ReferenceExpression<DB, TB> | ReadonlyArray<ReferenceExpression<DB, TB>>;
+import { OperationNode } from '../operation-node/operation-node.js';
+import { Expression } from '../expression/expression.js';
+import { SimpleReferenceExpressionNode } from '../operation-node/simple-reference-expression-node.js';
 export declare type StringReference<DB, TB extends keyof DB> = AnyColumn<DB, TB> | AnyColumnWithTable<DB, TB>;
-export declare type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE> = RE extends string ? SelectType<ExtractTypeFromStringReference<DB, TB, RE>> : RE extends RawBuilder<infer O> ? O : RE extends (qb: any) => RawBuilder<infer O> ? O : RE extends SelectQueryBuilder<any, any, infer O> ? ValueType<O> : RE extends (qb: any) => SelectQueryBuilder<any, any, infer O> ? ValueType<O> : unknown;
-declare type ExtractTypeFromStringReference<DB, TB extends keyof DB, RE extends string> = 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> : unknown;
-export declare function parseReferenceExpressionOrList(arg: ReferenceExpressionOrList<any, any>): ReferenceExpressionNode[];
-export declare function parseReferenceExpression(exp: ReferenceExpression<any, any>): ReferenceExpressionNode;
-export declare function parseStringReference(ref: string): ColumnNode | ReferenceNode;
-export declare function parseAliasedStringReference(ref: string): ColumnNode | ReferenceNode | AliasNode;
+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 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 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 {};

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

@@ -4,9 +4,14 @@ import { ColumnNode } from '../operation-node/column-node.js';
 import { ReferenceNode } from '../operation-node/reference-node.js';
 import { TableNode } from '../operation-node/table-node.js';
 import { isReadonlyArray, isString } from '../util/object-utils.js';
-import { parseComplexExpression, } from './complex-expression-parser.js';
-import { isDynamicReferenceBuilder, } from '../dynamic/dynamic-reference-builder.js';
+import { parseExpression, isExpressionOrFactory, } from './expression-parser.js';
 import { IdentifierNode } from '../operation-node/identifier-node.js';
+export function parseSimpleReferenceExpression(exp) {
+    if (isString(exp)) {
+        return parseStringReference(exp);
+    }
+    return exp.toOperationNode();
+}
 export function parseReferenceExpressionOrList(arg) {
     if (isReadonlyArray(arg)) {
         return arg.map((it) => parseReferenceExpression(it));
@@ -16,13 +21,10 @@ export function parseReferenceExpressionOrList(arg) {
     }
 }
 export function parseReferenceExpression(exp) {
-    if (isString(exp)) {
-        return parseStringReference(exp);
-    }
-    else if (isDynamicReferenceBuilder(exp)) {
-        return exp.toOperationNode();
+    if (isExpressionOrFactory(exp)) {
+        return parseExpression(exp);
     }
-    return parseComplexExpression(exp);
+    return parseSimpleReferenceExpression(exp);
 }
 export function parseStringReference(ref) {
     const COLUMN_SEPARATOR = '.';

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

@@ -1,11 +1,11 @@
-import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
-import { AliasedQueryBuilder, SelectQueryBuilder } from '../query-builder/select-query-builder.js';
+import { AliasedSelectQueryBuilder, SelectQueryBuilder } 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 { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
-import { AliasedComplexExpression } from './complex-expression-parser.js';
+import { AliasedExpressionOrFactory } from './expression-parser.js';
 import { Selectable, SelectType } from '../util/column-type.js';
-export declare type SelectExpression<DB, TB extends keyof DB> = AnyAliasedColumnWithTable<DB, TB> | AnyAliasedColumn<DB, TB> | AnyColumnWithTable<DB, TB> | AnyColumn<DB, TB> | DynamicReferenceBuilder<any> | AliasedComplexExpression<DB, TB>;
+import { AliasedExpression } from '../expression/expression.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 SelectExpressionOrList<DB, TB extends keyof DB> = SelectExpression<DB, TB> | ReadonlyArray<SelectExpression<DB, TB>>;
 /**
  * Given a selection expression returns a query builder type that
@@ -19,9 +19,9 @@ export declare type SelectAllQueryBuilder<DB, TB extends keyof DB, O, S extends
 export declare type Selection<DB, TB extends keyof DB, SE> = {
     [A in ExtractAliasFromSelectExpression<SE>]: SelectType<ExtractTypeFromSelectExpression<DB, TB, SE, A>>;
 };
-declare type ExtractAliasFromSelectExpression<SE> = SE extends string ? ExtractAliasFromStringSelectExpression<SE> : SE extends AliasedRawBuilder<any, infer RA> ? RA : SE extends (qb: any) => AliasedRawBuilder<any, infer RA> ? RA : SE extends AliasedQueryBuilder<any, any, any, infer QA> ? QA : SE extends (qb: any) => AliasedQueryBuilder<any, any, any, infer QA> ? QA : SE extends DynamicReferenceBuilder<infer RA> ? ExtractAliasFromStringSelectExpression<RA> : never;
+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 AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : SE extends (qb: any) => AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : SE extends AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends (qb: any) => AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<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 ? 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 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;
 declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
     [C in AnyColumn<DB, TB>]: {

package/dist/esm/parser/select-parser.js

@@ -3,7 +3,7 @@ import { isReadonlyArray, isString } from '../util/object-utils.js';
 import { SelectionNode } from '../operation-node/selection-node.js';
 import { parseAliasedStringReference } from './reference-parser.js';
 import { isDynamicReferenceBuilder, } from '../dynamic/dynamic-reference-builder.js';
-import { parseAliasedComplexExpression, } from './complex-expression-parser.js';
+import { parseAliasedExpression, } from './expression-parser.js';
 import { parseTable } from './table-parser.js';
 export function parseSelectExpressionOrList(selection) {
     if (isReadonlyArray(selection)) {
@@ -21,7 +21,7 @@ function parseSelectExpression(selection) {
         return SelectionNode.create(selection.toOperationNode());
     }
     else {
-        return SelectionNode.create(parseAliasedComplexExpression(selection));
+        return SelectionNode.create(parseAliasedExpression(selection));
     }
 }
 export function parseSelectAll(table) {

package/dist/esm/parser/set-operation-parser.d.ts

@@ -0,0 +1,3 @@
+import { Expression } from '../expression/expression.js';
+import { SetOperator, SetOperationNode } from '../operation-node/set-operation-node.js';
+export declare function parseSetOperation(operator: SetOperator, expression: Expression<any>, all: boolean): SetOperationNode;

package/dist/esm/parser/set-operation-parser.js

@@ -0,0 +1,5 @@
+/// <reference types="./set-operation-parser.d.ts" />
+import { SetOperationNode, } from '../operation-node/set-operation-node.js';
+export function parseSetOperation(operator, expression, all) {
+    return SetOperationNode.create(operator, expression.toOperationNode(), all);
+}

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

@@ -1,22 +1,21 @@
-import { AliasedQueryBuilder } from '../query-builder/select-query-builder.js';
+import { AliasNode } from '../operation-node/alias-node.js';
 import { TableNode } from '../operation-node/table-node.js';
-import { AnyAliasedRawBuilder } from '../util/type-utils.js';
-import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
-import { TableExpressionNode } from '../operation-node/operation-node-utils.js';
-import { AliasedComplexExpression } from './complex-expression-parser.js';
-export declare type TableExpression<DB, TB extends keyof DB> = TableReference<DB> | AliasedComplexExpression<DB, TB>;
+import { AliasedExpressionOrFactory } from './expression-parser.js';
+import { OperationNode } from '../operation-node/operation-node.js';
+import { AliasedExpression } from '../expression/expression.js';
+export declare type TableExpression<DB, TB extends keyof DB> = TableReference<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> | AnyAliasedRawBuilder;
+export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpression<any, any>;
 export declare type From<DB, TE> = {
     [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>;
-declare type ExtractAliasFromTableExpression<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : TE extends AliasedQueryBuilder<any, any, any, infer QA> ? QA : TE extends (qb: any) => AliasedQueryBuilder<any, any, any, infer QA> ? QA : TE extends AliasedRawBuilder<any, infer RA> ? RA : TE extends (qb: any) => AliasedRawBuilder<any, infer RA> ? RA : 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 AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O : never : TE extends AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : TE extends (qb: any) => AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : never;
+declare type ExtractAliasFromTableExpression<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof 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 AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
 declare type AnyTable<DB> = keyof DB & string;
-export declare function parseTableExpressionOrList(table: TableExpressionOrList<any, any>): TableExpressionNode[];
-export declare function parseTableExpression(table: TableExpression<any, any>): TableExpressionNode;
-export declare function parseAliasedTable(from: string): TableExpressionNode;
+export declare function parseTableExpressionOrList(table: TableExpressionOrList<any, any>): OperationNode[];
+export declare function parseTableExpression(table: TableExpression<any, any>): OperationNode;
+export declare function parseAliasedTable(from: string): TableNode | AliasNode;
 export declare function parseTable(from: string): TableNode;
 export {};