kysely 0.22.0 → 0.23.1

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

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

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

@@ -1,7 +1,6 @@
 import { ColumnUpdateNode } from './column-update-node.js';
 import { JoinNode } from './join-node.js';
 import { OperationNode } from './operation-node.js';
-import { TableExpressionNode } from './operation-node-utils.js';
 import { PrimitiveValueListNode } from './primitive-value-list-node.js';
 import { ReturningNode } from './returning-node.js';
 import { ValueListNode } from './value-list-node.js';
@@ -12,7 +11,7 @@ import { ExplainNode } from './explain-node.js';
 export declare type UpdateValuesNode = ValueListNode | PrimitiveValueListNode;
 export interface UpdateQueryNode extends OperationNode {
     readonly kind: 'UpdateQueryNode';
-    readonly table: TableExpressionNode;
+    readonly table: OperationNode;
     readonly from?: FromNode;
     readonly joins?: ReadonlyArray<JoinNode>;
     readonly where?: WhereNode;
@@ -26,8 +25,8 @@ export interface UpdateQueryNode extends OperationNode {
  */
 export declare const UpdateQueryNode: Readonly<{
     is(node: OperationNode): node is UpdateQueryNode;
-    create(table: TableExpressionNode, withNode?: WithNode): UpdateQueryNode;
-    cloneWithFromItems(updateQuery: UpdateQueryNode, fromItems: ReadonlyArray<TableExpressionNode>): UpdateQueryNode;
+    create(table: OperationNode, withNode?: WithNode): UpdateQueryNode;
+    cloneWithFromItems(updateQuery: UpdateQueryNode, fromItems: ReadonlyArray<OperationNode>): UpdateQueryNode;
     cloneWithUpdates(updateQuery: UpdateQueryNode, updates: ReadonlyArray<ColumnUpdateNode>): UpdateQueryNode;
     cloneWithExplain(updateQuery: UpdateQueryNode, explain: ExplainNode): UpdateQueryNode;
 }>;

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

@@ -1,19 +1,12 @@
-import { AggregateFunctionNode } from './aggregate-function-node.js';
-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 | AggregateFunctionNode;
 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/cjs/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/cjs/operation-node/where-node.js

@@ -17,12 +17,12 @@ exports.WhereNode = (0, object_utils_js_1.freeze)({
             where: filter,
         });
     },
-    cloneWithFilter(whereNode, op, filter) {
+    cloneWithOperation(whereNode, operator, operation) {
         return (0, object_utils_js_1.freeze)({
             ...whereNode,
-            where: op === 'And'
-                ? and_node_js_1.AndNode.create(whereNode.where, filter)
-                : or_node_js_1.OrNode.create(whereNode.where, filter),
+            where: operator === 'And'
+                ? and_node_js_1.AndNode.create(whereNode.where, operation)
+                : or_node_js_1.OrNode.create(whereNode.where, operation),
         });
     },
 });

package/dist/cjs/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/cjs/parser/binary-operation-parser.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFilterExpression = exports.parseReferentialFilter = exports.parseOn = exports.parseHaving = exports.parseWhere = 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");
+const raw_node_js_1 = require("../operation-node/raw-node.js");
+const operator_node_js_1 = require("../operation-node/operator-node.js");
+const parens_node_js_1 = require("../operation-node/parens-node.js");
+const reference_parser_js_1 = require("./reference-parser.js");
+const value_parser_js_1 = require("./value-parser.js");
+const value_node_js_1 = require("../operation-node/value-node.js");
+const parse_utils_js_1 = require("./parse-utils.js");
+function parseWhere(args) {
+    return parseFilterExpression('where', args);
+}
+exports.parseWhere = parseWhere;
+function parseHaving(args) {
+    return parseFilterExpression('having', args);
+}
+exports.parseHaving = parseHaving;
+function parseOn(args) {
+    return parseFilterExpression('on', args);
+}
+exports.parseOn = parseOn;
+function parseReferentialFilter(leftOperand, operator, rightOperand) {
+    return binary_operation_node_js_1.BinaryOperationNode.create((0, reference_parser_js_1.parseReferenceExpression)(leftOperand), parseComparisonOperatorExpression(operator), (0, reference_parser_js_1.parseReferenceExpression)(rightOperand));
+}
+exports.parseReferentialFilter = parseReferentialFilter;
+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);
+}
+exports.parseFilterExpression = parseFilterExpression;
+function parseFilter(leftOperand, operator, rightOperand) {
+    if ((operator === 'is' || operator === 'is not') &&
+        ((0, object_utils_js_1.isNull)(rightOperand) || (0, object_utils_js_1.isBoolean)(rightOperand))) {
+        return parseIs(leftOperand, operator, rightOperand);
+    }
+    return binary_operation_node_js_1.BinaryOperationNode.create((0, reference_parser_js_1.parseReferenceExpression)(leftOperand), parseComparisonOperatorExpression(operator), (0, value_parser_js_1.parseValueExpressionOrList)(rightOperand));
+}
+function parseIs(leftOperand, operator, rightOperand) {
+    return binary_operation_node_js_1.BinaryOperationNode.create((0, reference_parser_js_1.parseReferenceExpression)(leftOperand), parseComparisonOperatorExpression(operator), value_node_js_1.ValueNode.createImmediate(rightOperand));
+}
+function parseComparisonOperatorExpression(operator) {
+    if ((0, object_utils_js_1.isString)(operator) && operator_node_js_1.COMPARISON_OPERATORS.includes(operator)) {
+        return operator_node_js_1.OperatorNode.create(operator);
+    }
+    else if ((0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
+        return operator.toOperationNode();
+    }
+    throw new Error(`invalid comparison operator ${JSON.stringify(operator)} passed to a filter method`);
+}
+function parseOneArgFilterExpression(type, arg) {
+    if ((0, object_utils_js_1.isFunction)(arg)) {
+        return GROUP_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)) {
+            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 = (0, object_utils_js_1.freeze)({
+    where(callback) {
+        const query = callback((0, parse_utils_js_1.createSelectQueryBuilder)());
+        const queryNode = query.toOperationNode();
+        if (!queryNode.where) {
+            throw new Error('no `where` methods called inside a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(queryNode.where.where);
+    },
+    having(callback) {
+        const query = callback((0, parse_utils_js_1.createSelectQueryBuilder)());
+        const queryNode = query.toOperationNode();
+        if (!queryNode.having) {
+            throw new Error('no `having` methods called inside a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(queryNode.having.having);
+    },
+    on(callback) {
+        const joinBuilder = callback((0, parse_utils_js_1.createJoinBuilder)('InnerJoin', 'table'));
+        const joinNode = joinBuilder.toOperationNode();
+        if (!joinNode.on) {
+            throw new Error('no `on` methods called inside a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(joinNode.on.on);
+    },
+});

package/dist/cjs/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/cjs/parser/coalesce-parser.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCoalesce = void 0;
+const raw_node_js_1 = require("../operation-node/raw-node.js");
+const reference_parser_js_1 = require("./reference-parser.js");
+function parseCoalesce(values) {
+    return raw_node_js_1.RawNode.create(values.length > 1
+        ? ['coalesce(', ...new Array(values.length - 1).fill(', '), ')']
+        : ['coalesce(', ')'], (0, reference_parser_js_1.parseReferenceExpressionOrList)(values));
+}
+exports.parseCoalesce = parseCoalesce;

package/dist/cjs/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/cjs/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/cjs/parser/default-value-parser.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDefaultValueExpression = void 0;
+const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const value_node_js_1 = require("../operation-node/value-node.js");
-const raw_builder_js_1 = require("../raw-builder/raw-builder.js");
 function parseDefaultValueExpression(value) {
-    return value instanceof raw_builder_js_1.RawBuilder
+    return (0, operation_node_source_js_1.isOperationNodeSource)(value)
         ? value.toOperationNode()
         : value_node_js_1.ValueNode.createImmediate(value);
 }

package/dist/cjs/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/cjs/parser/{complex-expression-parser.js → expression-parser.js}

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isComplexExpression = exports.parseAliasedComplexExpression = exports.parseComplexExpression = void 0;
+exports.isExpressionOrFactory = exports.parseAliasedExpression = exports.parseExpression = void 0;
+const expression_js_1 = require("../expression/expression.js");
 const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const parse_utils_js_1 = require("./parse-utils.js");
-function parseComplexExpression(exp) {
+function parseExpression(exp) {
     if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
         return exp.toOperationNode();
     }
@@ -13,8 +14,8 @@ function parseComplexExpression(exp) {
     }
     throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
 }
-exports.parseComplexExpression = parseComplexExpression;
-function parseAliasedComplexExpression(exp) {
+exports.parseExpression = parseExpression;
+function parseAliasedExpression(exp) {
     if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
         return exp.toOperationNode();
     }
@@ -23,8 +24,8 @@ function parseAliasedComplexExpression(exp) {
     }
     throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
 }
-exports.parseAliasedComplexExpression = parseAliasedComplexExpression;
-function isComplexExpression(obj) {
-    return (0, operation_node_source_js_1.isOperationNodeSource)(obj) || (0, object_utils_js_1.isFunction)(obj);
+exports.parseAliasedExpression = parseAliasedExpression;
+function isExpressionOrFactory(obj) {
+    return (0, expression_js_1.isExpression)(obj) || (0, object_utils_js_1.isFunction)(obj);
 }
-exports.isComplexExpression = isComplexExpression;
+exports.isExpressionOrFactory = isExpressionOrFactory;

package/dist/cjs/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/cjs/parser/identifier-parser.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSchemableIdentifier = void 0;
+const schemable_identifier_node_js_1 = require("../operation-node/schemable-identifier-node.js");
+function parseSchemableIdentifier(id) {
+    const SCHEMA_SEPARATOR = '.';
+    if (id.includes(SCHEMA_SEPARATOR)) {
+        const parts = id.split(SCHEMA_SEPARATOR).map(trim);
+        if (parts.length === 2) {
+            return schemable_identifier_node_js_1.SchemableIdentifierNode.createWithSchema(parts[0], parts[1]);
+        }
+        else {
+            throw new Error(`invalid schemable identifier ${id}`);
+        }
+    }
+    else {
+        return schemable_identifier_node_js_1.SchemableIdentifierNode.create(id);
+    }
+}
+exports.parseSchemableIdentifier = parseSchemableIdentifier;
+function trim(str) {
+    return str.trim();
+}

package/dist/cjs/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/cjs/parser/insert-values-parser.js

@@ -7,7 +7,7 @@ const value_list_node_js_1 = require("../operation-node/value-list-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const value_parser_js_1 = require("./value-parser.js");
 const values_node_js_1 = require("../operation-node/values-node.js");
-const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
+const expression_parser_js_1 = require("./expression-parser.js");
 const default_insert_value_node_js_1 = require("../operation-node/default-insert-value-node.js");
 function parseInsertObjectOrList(args) {
     return parseInsertColumnsAndValues(Array.isArray(args) ? args : [args]);
@@ -42,7 +42,7 @@ function parseRowValues(row, columns) {
         const columnIdx = columns.get(col);
         if (columnIdx !== undefined) {
             const value = row[col];
-            if ((0, complex_expression_parser_js_1.isComplexExpression)(value)) {
+            if ((0, expression_parser_js_1.isExpressionOrFactory)(value)) {
                 complexColumn = true;
             }
             rowValues[columnIdx] = value;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJoin = void 0;
 const join_node_js_1 = require("../operation-node/join-node.js");
 const table_parser_js_1 = require("./table-parser.js");
-const filter_parser_js_1 = require("./filter-parser.js");
+const binary_operation_parser_js_1 = require("./binary-operation-parser.js");
 const parse_utils_js_1 = require("./parse-utils.js");
 function parseJoin(joinType, args) {
     if (args.length === 3) {
@@ -22,5 +22,5 @@ function parseCallbackJoin(joinType, from, callback) {
     return joinBuilder.toOperationNode();
 }
 function parseSingleOnJoin(joinType, from, lhsColumn, rhsColumn) {
-    return join_node_js_1.JoinNode.createWithOn(joinType, (0, table_parser_js_1.parseTableExpression)(from), (0, filter_parser_js_1.parseReferenceFilter)(lhsColumn, '=', rhsColumn));
+    return join_node_js_1.JoinNode.createWithOn(joinType, (0, table_parser_js_1.parseTableExpression)(from), (0, binary_operation_parser_js_1.parseReferentialFilter)(lhsColumn, '=', rhsColumn));
 }

package/dist/cjs/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/cjs/parser/reference-parser.d.ts

@@ -1,22 +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';
-import { AggregateFunctionBuilder } from '../query-builder/aggregate-function-builder.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> : RE extends AggregateFunctionBuilder<any, any, infer O> ? O : RE extends (qb: any) => AggregateFunctionBuilder<any, any, infer O> ? 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/cjs/parser/reference-parser.js

@@ -1,14 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseColumnName = exports.parseAliasedStringReference = exports.parseStringReference = exports.parseReferenceExpression = exports.parseReferenceExpressionOrList = void 0;
+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");
 const table_node_js_1 = require("../operation-node/table-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
-const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
-const dynamic_reference_builder_js_1 = require("../dynamic/dynamic-reference-builder.js");
+const expression_parser_js_1 = require("./expression-parser.js");
 const identifier_node_js_1 = require("../operation-node/identifier-node.js");
+function parseSimpleReferenceExpression(exp) {
+    if ((0, object_utils_js_1.isString)(exp)) {
+        return parseStringReference(exp);
+    }
+    return exp.toOperationNode();
+}
+exports.parseSimpleReferenceExpression = parseSimpleReferenceExpression;
 function parseReferenceExpressionOrList(arg) {
     if ((0, object_utils_js_1.isReadonlyArray)(arg)) {
         return arg.map((it) => parseReferenceExpression(it));
@@ -19,13 +25,10 @@ function parseReferenceExpressionOrList(arg) {
 }
 exports.parseReferenceExpressionOrList = parseReferenceExpressionOrList;
 function parseReferenceExpression(exp) {
-    if ((0, object_utils_js_1.isString)(exp)) {
-        return parseStringReference(exp);
-    }
-    else if ((0, dynamic_reference_builder_js_1.isDynamicReferenceBuilder)(exp)) {
-        return exp.toOperationNode();
+    if ((0, expression_parser_js_1.isExpressionOrFactory)(exp)) {
+        return (0, expression_parser_js_1.parseExpression)(exp);
     }
-    return (0, complex_expression_parser_js_1.parseComplexExpression)(exp);
+    return parseSimpleReferenceExpression(exp);
 }
 exports.parseReferenceExpression = parseReferenceExpression;
 function parseStringReference(ref) {

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

@@ -1,12 +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';
-import { AliasedAggregateFunctionBuilder } from '../query-builder/aggregate-function-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> | AliasedComplexExpression<DB, TB> | AliasedAggregateFunctionBuilder<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
@@ -20,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> : SE extends AliasedAggregateFunctionBuilder<any, any, any, infer QA> ? QA : SE extends (qb: any) => AliasedAggregateFunctionBuilder<any, any, any, infer QA> ? QA : 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 : SE extends AliasedAggregateFunctionBuilder<any, any, infer O, infer FA> ? FA extends A ? O : never : SE extends (qb: any) => AliasedAggregateFunctionBuilder<any, any, infer O, infer FA> ? FA extends A ? O : 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/cjs/parser/select-parser.js

@@ -5,7 +5,7 @@ const object_utils_js_1 = require("../util/object-utils.js");
 const selection_node_js_1 = require("../operation-node/selection-node.js");
 const reference_parser_js_1 = require("./reference-parser.js");
 const dynamic_reference_builder_js_1 = require("../dynamic/dynamic-reference-builder.js");
-const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
+const expression_parser_js_1 = require("./expression-parser.js");
 const table_parser_js_1 = require("./table-parser.js");
 function parseSelectExpressionOrList(selection) {
     if ((0, object_utils_js_1.isReadonlyArray)(selection)) {
@@ -24,7 +24,7 @@ function parseSelectExpression(selection) {
         return selection_node_js_1.SelectionNode.create(selection.toOperationNode());
     }
     else {
-        return selection_node_js_1.SelectionNode.create((0, complex_expression_parser_js_1.parseAliasedComplexExpression)(selection));
+        return selection_node_js_1.SelectionNode.create((0, expression_parser_js_1.parseAliasedExpression)(selection));
     }
 }
 function parseSelectAll(table) {

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

@@ -1,5 +1,3 @@
+import { Expression } from '../expression/expression.js';
 import { SetOperator, SetOperationNode } from '../operation-node/set-operation-node.js';
-import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
-import { RawBuilder } from '../raw-builder/raw-builder.js';
-export declare type SetOperationExpression<DB, O> = SelectQueryBuilder<DB, any, O> | RawBuilder<O>;
-export declare function parseSetOperation(operator: SetOperator, expression: SetOperationExpression<any, any>, all: boolean): SetOperationNode;
+export declare function parseSetOperation(operator: SetOperator, expression: Expression<any>, all: boolean): SetOperationNode;

package/dist/cjs/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 {};