kysely 0.11.1 → 0.12.0

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNotExistFilter = exports.parseExistFilter = exports.parseReferenceFilter = exports.parseOnFilter = exports.parseHavingFilter = exports.parseWhereFilter = void 0;
+exports.parseFilter = exports.parseNotExistFilter = exports.parseExistFilter = exports.parseReferenceFilter = exports.parseOnFilter = exports.parseHavingFilter = exports.parseWhereFilter = void 0;
 const filter_node_js_1 = require("../operation-node/filter-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");
@@ -9,42 +9,17 @@ 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 select_query_node_js_1 = require("../operation-node/select-query-node.js");
 const value_node_js_1 = require("../operation-node/value-node.js");
 function parseWhereFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && (0, object_utils_js_1.isFunction)(args[0])) {
-        return parseWhereGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to a where method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'where', args);
 }
 exports.parseWhereFilter = parseWhereFilter;
 function parseHavingFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && (0, object_utils_js_1.isFunction)(args[0])) {
-        return parseHavingGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to a having method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'having', args);
 }
 exports.parseHavingFilter = parseHavingFilter;
 function parseOnFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && (0, object_utils_js_1.isFunction)(args[0])) {
-        return parseOnGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to an on method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'on', args);
 }
 exports.parseOnFilter = parseOnFilter;
 function parseReferenceFilter(ctx, lhs, op, rhs) {
@@ -59,6 +34,16 @@ function parseNotExistFilter(ctx, arg) {
     return parseExistExpression(ctx, 'not exists', arg);
 }
 exports.parseNotExistFilter = parseNotExistFilter;
+function parseFilter(ctx, type, args) {
+    if (args.length === 3) {
+        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
+    }
+    else if (args.length === 1) {
+        return parseOneArgFilter(ctx, type, args[0]);
+    }
+    throw createFilterError(type, args);
+}
+exports.parseFilter = parseFilter;
 function parseThreeArgFilter(ctx, left, op, right) {
     if ((op === 'is' || op === 'is not') && ((0, object_utils_js_1.isNull)(right) || (0, object_utils_js_1.isBoolean)(right))) {
         return parseIsFilter(ctx, left, op, right);
@@ -69,46 +54,55 @@ function parseIsFilter(ctx, left, op, right) {
     return filter_node_js_1.FilterNode.create((0, reference_parser_js_1.parseReferenceExpression)(ctx, left), parseFilterOperator(op), value_node_js_1.ValueNode.createImmediate(right));
 }
 function parseFilterOperator(op) {
-    if ((0, object_utils_js_1.isString)(op)) {
-        if (operator_node_js_1.OPERATORS.includes(op)) {
-            return operator_node_js_1.OperatorNode.create(op);
-        }
+    if ((0, object_utils_js_1.isString)(op) && operator_node_js_1.OPERATORS.includes(op)) {
+        return operator_node_js_1.OperatorNode.create(op);
     }
     else if ((0, operation_node_source_js_1.isOperationNodeSource)(op)) {
         return op.toOperationNode();
     }
     throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
 }
-function parseWhereGroup(ctx, callback) {
-    const query = callback(ctx.createSelectQueryBuilder([]));
-    const queryNode = query.toOperationNode();
-    if (!queryNode.where) {
-        throw new Error('no `where*` methods called insided a group callback');
-    }
-    return parens_node_js_1.ParensNode.create(queryNode.where.where);
-}
-function parseHavingGroup(ctx, callback) {
-    const query = callback(ctx.createSelectQueryBuilder([]));
-    const queryNode = query.toOperationNode();
-    if (!queryNode.having) {
-        throw new Error('no `having*` methods called insided a group callback');
-    }
-    return parens_node_js_1.ParensNode.create(queryNode.having.having);
+function parseExistExpression(ctx, type, arg) {
+    return filter_node_js_1.FilterNode.create(undefined, operator_node_js_1.OperatorNode.create(type), (0, value_parser_js_1.parseValueExpressionOrList)(ctx, arg));
 }
-function parseOnGroup(ctx, callback) {
-    const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
-    const joinNode = joinBuilder.toOperationNode();
-    if (!joinNode.on) {
-        throw new Error('no `on*` methods called insided a group callback');
+function parseOneArgFilter(ctx, type, arg) {
+    if ((0, object_utils_js_1.isFunction)(arg)) {
+        return GROUP_PARSERS[type](ctx, 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;
+        }
     }
-    return parens_node_js_1.ParensNode.create(joinNode.on.on);
+    throw createFilterError(type, arg);
 }
-function parseExistExpression(ctx, type, arg) {
-    const node = (0, object_utils_js_1.isFunction)(arg)
-        ? arg(ctx.createExpressionBuilder()).toOperationNode()
-        : arg.toOperationNode();
-    if (!select_query_node_js_1.SelectQueryNode.is(node) && !raw_node_js_1.RawNode.is(node)) {
-        throw new Error('invalid where exists arg');
-    }
-    return filter_node_js_1.FilterNode.create(undefined, operator_node_js_1.OperatorNode.create(type), node);
+function createFilterError(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(ctx, callback) {
+        const query = callback(ctx.createSelectQueryBuilder());
+        const queryNode = query.toOperationNode();
+        if (!queryNode.where) {
+            throw new Error('no `where` methods called insided a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(queryNode.where.where);
+    },
+    having(ctx, callback) {
+        const query = callback(ctx.createSelectQueryBuilder());
+        const queryNode = query.toOperationNode();
+        if (!queryNode.having) {
+            throw new Error('no `having` methods called insided a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(queryNode.having.having);
+    },
+    on(ctx, callback) {
+        const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
+        const joinNode = joinBuilder.toOperationNode();
+        if (!joinNode.on) {
+            throw new Error('no `on` methods called insided a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(joinNode.on.on);
+    },
+});

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

@@ -1,15 +1,12 @@
 import { ColumnNode } from '../operation-node/column-node.js';
-import { InsertValuesNode } from '../operation-node/insert-query-node.js';
-import { RawNode } from '../operation-node/raw-node.js';
-import { SelectQueryNode } from '../operation-node/select-query-node.js';
-import { ValueNode } from '../operation-node/value-node.js';
-import { AnyQueryBuilder, AnyRawBuilder, GeneratedPlaceholder } from '../util/type-utils.js';
-import { PrimitiveValue } from '../util/object-utils.js';
+import { GeneratedPlaceholder } from '../util/type-utils.js';
+import { ParseContext } from './parse-context.js';
+import { ValueExpression } from './value-parser.js';
+import { ValuesNode } from '../operation-node/values-node.js';
 export declare type InsertObject<DB, TB extends keyof DB> = {
-    [C in keyof DB[TB]]: InsertValueExpression<DB[TB][C]>;
+    [C in keyof DB[TB]]: InsertValueExpression<DB, TB, DB[TB][C]>;
 };
 export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
-declare type InsertValueExpression<T> = T | AnyQueryBuilder | AnyRawBuilder | GeneratedPlaceholder;
-export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ReadonlyArray<InsertValuesNode>];
-export declare function parseInsertValueExpression(value: InsertValueExpression<PrimitiveValue>): ValueNode | RawNode | SelectQueryNode;
+declare type InsertValueExpression<DB, TB extends keyof DB, T> = ValueExpression<DB, TB, T> | GeneratedPlaceholder;
+export declare function parseInsertObjectOrList(ctx: ParseContext, args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];
 export {};

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

@@ -1,56 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseInsertValueExpression = exports.parseInsertObjectOrList = void 0;
+exports.parseInsertObjectOrList = void 0;
 const column_node_js_1 = require("../operation-node/column-node.js");
-const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const primitive_value_list_node_js_1 = require("../operation-node/primitive-value-list-node.js");
-const query_node_js_1 = require("../operation-node/query-node.js");
 const value_list_node_js_1 = require("../operation-node/value-list-node.js");
-const value_node_js_1 = require("../operation-node/value-node.js");
 const generated_placeholder_js_1 = require("../util/generated-placeholder.js");
 const object_utils_js_1 = require("../util/object-utils.js");
-function parseInsertObjectOrList(args) {
-    return parseInsertColumnsAndValues(Array.isArray(args) ? args : [args]);
+const value_parser_js_1 = require("./value-parser.js");
+const values_node_js_1 = require("../operation-node/values-node.js");
+function parseInsertObjectOrList(ctx, args) {
+    return parseInsertColumnsAndValues(ctx, Array.isArray(args) ? args : [args]);
 }
 exports.parseInsertObjectOrList = parseInsertObjectOrList;
-function parseInsertColumnsAndValues(rows) {
-    const columns = [];
-    const values = [];
+function parseInsertColumnsAndValues(ctx, rows) {
+    const columns = parseColumnNamesAndIndexes(rows);
+    return [
+        (0, object_utils_js_1.freeze)([...columns.keys()].map(column_node_js_1.ColumnNode.create)),
+        values_node_js_1.ValuesNode.create(rows.map((row) => parseRowValues(ctx, row, columns))),
+    ];
+}
+function parseColumnNamesAndIndexes(rows) {
+    const columns = new Map();
     for (const row of rows) {
-        for (const column of Object.keys(row)) {
-            const value = row[column];
-            if (!columns.includes(column) && !(0, generated_placeholder_js_1.isGeneratedPlaceholder)(value)) {
-                columns.push(column);
+        const cols = Object.keys(row);
+        for (const col of cols) {
+            if (!columns.has(col) && !(0, generated_placeholder_js_1.isGeneratedPlaceholder)(row[col])) {
+                columns.set(col, columns.size);
             }
         }
     }
-    for (const row of rows) {
-        const rowValues = columns.map(() => null);
-        for (const column of Object.keys(row)) {
-            const columnIdx = columns.indexOf(column);
-            if (columnIdx !== -1) {
-                rowValues[columnIdx] = row[column];
-            }
-        }
-        if (rowValues.every(object_utils_js_1.isPrimitive)) {
-            values.push(primitive_value_list_node_js_1.PrimitiveValueListNode.create(rowValues));
-        }
-        else {
-            values.push(value_list_node_js_1.ValueListNode.create(rowValues.map(parseInsertValueExpression)));
-        }
-    }
-    return [columns.map(column_node_js_1.ColumnNode.create), values];
+    return columns;
 }
-function parseInsertValueExpression(value) {
-    if ((0, object_utils_js_1.isPrimitive)(value)) {
-        return value_node_js_1.ValueNode.create(value);
-    }
-    else if ((0, operation_node_source_js_1.isOperationNodeSource)(value)) {
-        const node = value.toOperationNode();
-        if (!query_node_js_1.QueryNode.isMutating(node)) {
-            return node;
+function parseRowValues(ctx, row, columns) {
+    const rowColumns = Object.keys(row);
+    const rowValues = new Array(columns.size).fill(null);
+    for (const col of rowColumns) {
+        const columnIdx = columns.get(col);
+        const value = row[col];
+        if (columnIdx !== undefined && !(0, generated_placeholder_js_1.isGeneratedPlaceholder)(value)) {
+            rowValues[columnIdx] = value;
         }
     }
-    throw new Error(`unsupported value for insert object ${JSON.stringify(value)}`);
+    if (rowValues.every(object_utils_js_1.isPrimitive)) {
+        return primitive_value_list_node_js_1.PrimitiveValueListNode.create(rowValues);
+    }
+    return value_list_node_js_1.ValueListNode.create(rowValues.map((it) => (0, value_parser_js_1.parseValueExpression)(ctx, it)));
 }
-exports.parseInsertValueExpression = parseInsertValueExpression;

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

@@ -3,6 +3,6 @@ import { AnyRawBuilder } from '../util/type-utils.js';
 import { ParseContext } from './parse-context.js';
 import { ReferenceExpression } from './reference-parser.js';
 export declare type OrderByDirection = 'asc' | 'desc';
-export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | keyof O;
+export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | (keyof O & string);
 export declare type OrderByDirectionExpression = OrderByDirection | AnyRawBuilder;
 export declare function parseOrderBy(ctx: ParseContext, orderBy: OrderByExpression<any, any, any>, direction?: OrderByDirectionExpression): OrderByItemNode;

package/dist/cjs/parser/parse-context.d.ts

@@ -1,7 +1,7 @@
 import { DialectAdapter } from '../dialect/dialect-adapter.js';
 import { JoinType } from '../operation-node/join-node.js';
 import { JoinBuilder } from '../query-builder/join-builder.js';
-import { QueryBuilder } from '../query-builder/query-builder.js';
+import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { ExpressionBuilder } from '../query-builder/expression-builder.js';
 import { QueryCreator } from '../query-creator.js';
 import { TableExpression } from './table-parser.js';
@@ -14,11 +14,7 @@ export interface ParseContext {
     /**
      * Creates a select query builder with a {@link NoopQueryExecutor}.
      */
-    createSelectQueryBuilder(tables: ReadonlyArray<TableExpression<any, any>>): QueryBuilder<any, any>;
-    /**
-     * Creates an instance of a join builder.
-     */
-    createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
+    createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
     /**
      * Creates an expression builder for building stuff like subqueries.
      * {@link NoopQueryExecutor} is used as the executor and the queries
@@ -29,13 +25,17 @@ export interface ParseContext {
      * Creates a query creator with a {@link NoopQueryExecutor}.
      */
     createQueryCreator(): QueryCreator<any>;
+    /**
+     * Creates an instance of a join builder.
+     */
+    createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
 }
 export declare class DefaultParseContext implements ParseContext {
     #private;
     constructor(adapter: DialectAdapter);
     get adapter(): DialectAdapter;
-    createSelectQueryBuilder(tables: ReadonlyArray<TableExpression<any, any>>): QueryBuilder<any, any>;
-    createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
+    createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
     createExpressionBuilder(): ExpressionBuilder<any, any>;
     createQueryCreator(): QueryCreator<any>;
+    createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
 }

package/dist/cjs/parser/parse-context.js

@@ -4,7 +4,7 @@ exports.DefaultParseContext = void 0;
 const join_node_js_1 = require("../operation-node/join-node.js");
 const select_query_node_js_1 = require("../operation-node/select-query-node.js");
 const join_builder_js_1 = require("../query-builder/join-builder.js");
-const query_builder_js_1 = require("../query-builder/query-builder.js");
+const select_query_builder_js_1 = require("../query-builder/select-query-builder.js");
 const expression_builder_js_1 = require("../query-builder/expression-builder.js");
 const query_creator_js_1 = require("../query-creator.js");
 const noop_query_executor_js_1 = require("../query-executor/noop-query-executor.js");
@@ -20,18 +20,12 @@ class DefaultParseContext {
     get adapter() {
         return this.#adapter;
     }
-    createSelectQueryBuilder(tables) {
-        return new query_builder_js_1.QueryBuilder({
+    createSelectQueryBuilder() {
+        return new select_query_builder_js_1.SelectQueryBuilder({
             queryId: (0, query_id_js_1.createQueryId)(),
             executor: this.#noopExecutor,
             parseContext: this,
-            queryNode: select_query_node_js_1.SelectQueryNode.create((0, table_parser_js_1.parseTableExpressionOrList)(this, tables)),
-        });
-    }
-    createJoinBuilder(joinType, table) {
-        return new join_builder_js_1.JoinBuilder({
-            joinNode: join_node_js_1.JoinNode.create(joinType, (0, table_parser_js_1.parseTableExpression)(this, table)),
-            parseContext: this,
+            queryNode: select_query_node_js_1.SelectQueryNode.create((0, table_parser_js_1.parseTableExpressionOrList)(this, [])),
         });
     }
     createExpressionBuilder() {
@@ -46,5 +40,11 @@ class DefaultParseContext {
             parseContext: this,
         });
     }
+    createJoinBuilder(joinType, table) {
+        return new join_builder_js_1.JoinBuilder({
+            joinNode: join_node_js_1.JoinNode.create(joinType, (0, table_parser_js_1.parseTableExpression)(this, table)),
+            parseContext: this,
+        });
+    }
 }
 exports.DefaultParseContext = DefaultParseContext;

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

@@ -3,18 +3,19 @@ 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 { PrimitiveValue } from '../util/object-utils.js';
-import { AnyColumn, AnyColumnWithTable, AnyQueryBuilder, AnyRawBuilder, QueryBuilderFactory, RawBuilderFactory, RowType, ValueType } from '../util/type-utils.js';
-import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
+import { AnyColumn, AnyColumnWithTable, RowType, ValueType } from '../util/type-utils.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { QueryBuilder } from '../query-builder/query-builder.js';
+import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { ParseContext } from './parse-context.js';
-export declare type ReferenceExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | AnyQueryBuilder | QueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB> | DynamicReferenceBuilder<any>;
+import { ComplexExpression } from './complex-expression-parser.js';
+import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-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>>;
 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 ? ExtractTypeFromStringReference<DB, TB, RE> : RE extends RawBuilder<infer O> ? O : RE extends (qb: any) => RawBuilder<infer O> ? O : RE extends QueryBuilder<any, any, infer O> ? ValueType<O> : RE extends (qb: any) => QueryBuilder<any, any, infer O> ? ValueType<O> : PrimitiveValue;
-declare type ExtractTypeFromStringReference<DB, TB extends keyof DB, S extends string, R = RowType<DB, TB>> = S extends `${infer SC}.${infer T}.${infer C}` ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : S extends `${infer T}.${infer C}` ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : S extends keyof R ? R[S] : PrimitiveValue;
+export declare type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE> = RE extends string ? 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> : PrimitiveValue;
+declare type ExtractTypeFromStringReference<DB, TB extends keyof DB, RE extends string, R = RowType<DB, TB>> = 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 keyof R ? R[RE] : PrimitiveValue;
 export declare function parseReferenceExpressionOrList(ctx: ParseContext, arg: ReferenceExpressionOrList<any, any>): ReferenceExpressionNode[];
-export declare function parseReferenceExpression(ctx: ParseContext, arg: ReferenceExpression<any, any>): ReferenceExpressionNode;
+export declare function parseReferenceExpression(ctx: ParseContext, exp: ReferenceExpression<any, any>): ReferenceExpressionNode;
 export declare function parseStringReference(ref: string): ColumnNode | ReferenceNode;
 export declare function parseAliasedStringReference(ref: string): ColumnNode | ReferenceNode | AliasNode;
 export declare function parseColumnName(column: AnyColumn<any, any>): ColumnNode;

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

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseColumnName = exports.parseAliasedStringReference = exports.parseStringReference = exports.parseReferenceExpression = exports.parseReferenceExpressionOrList = 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 operation_node_source_js_1 = require("../operation-node/operation-node-source.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 query_node_js_1 = require("../operation-node/query-node.js");
+const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
+const dynamic_reference_builder_js_1 = require("../dynamic/dynamic-reference-builder.js");
 function parseReferenceExpressionOrList(ctx, arg) {
     if ((0, object_utils_js_1.isReadonlyArray)(arg)) {
         return arg.map((it) => parseReferenceExpression(ctx, it));
@@ -17,23 +17,14 @@ function parseReferenceExpressionOrList(ctx, arg) {
     }
 }
 exports.parseReferenceExpressionOrList = parseReferenceExpressionOrList;
-function parseReferenceExpression(ctx, arg) {
-    if ((0, object_utils_js_1.isString)(arg)) {
-        return parseStringReference(arg);
+function parseReferenceExpression(ctx, exp) {
+    if ((0, object_utils_js_1.isString)(exp)) {
+        return parseStringReference(exp);
     }
-    else if ((0, operation_node_source_js_1.isOperationNodeSource)(arg)) {
-        const node = arg.toOperationNode();
-        if (!query_node_js_1.QueryNode.isMutating(node)) {
-            return node;
-        }
-    }
-    else if ((0, object_utils_js_1.isFunction)(arg)) {
-        const node = arg(ctx.createExpressionBuilder()).toOperationNode();
-        if (!query_node_js_1.QueryNode.isMutating(node)) {
-            return node;
-        }
+    else if ((0, dynamic_reference_builder_js_1.isDynamicReferenceBuilder)(exp)) {
+        return exp.toOperationNode();
     }
-    throw new Error(`invalid reference expression ${JSON.stringify(arg)}`);
+    return (0, complex_expression_parser_js_1.parseComplexExpression)(ctx, exp);
 }
 exports.parseReferenceExpression = parseReferenceExpression;
 function parseStringReference(ref) {

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

@@ -1,9 +1,5 @@
 import { DeleteResult } from '../query-builder/delete-result.js';
 import { InsertResult } from '../query-builder/insert-result.js';
-import { QueryBuilder } from '../query-builder/query-builder.js';
 import { UpdateResult } from '../query-builder/update-result.js';
 import { Selection } from './select-parser.js';
-/**
- * `returning` method output query builder type
- */
-export declare type QueryBuilderWithReturning<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends InsertResult ? Selection<DB, TB, S> : O extends DeleteResult ? Selection<DB, TB, S> : O extends UpdateResult ? Selection<DB, TB, S> : O & Selection<DB, TB, S>>;
+export declare type ReturningRow<DB, TB extends keyof DB, O, SE> = O extends InsertResult ? Selection<DB, TB, SE> : O extends DeleteResult ? Selection<DB, TB, SE> : O extends UpdateResult ? Selection<DB, TB, SE> : O & Selection<DB, TB, SE>;

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

@@ -1,30 +1,28 @@
 import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
-import { AliasedQueryBuilder, QueryBuilder } from '../query-builder/query-builder.js';
+import { AliasedQueryBuilder, SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { SelectionNode } from '../operation-node/selection-node.js';
-import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedColumn, AnyAliasedColumnWithTable, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnyColumn, AnyColumnWithTable, RowType, ValueType } from '../util/type-utils.js';
+import { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, RowType, ValueType } from '../util/type-utils.js';
 import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
 import { ParseContext } from './parse-context.js';
-/**
- * A selection expression.
- */
-export declare type SelectExpression<DB, TB extends keyof DB> = AnyAliasedColumnWithTable<DB, TB> | AnyAliasedColumn<DB, TB> | AnyColumnWithTable<DB, TB> | AnyColumn<DB, TB> | AnyAliasedRawBuilder | AliasedRawBuilderFactory<DB, TB> | AnyAliasedQueryBuilder | AliasedQueryBuilderFactory<DB, TB> | DynamicReferenceBuilder<any>;
+import { AliasedComplexExpression } from './complex-expression-parser.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>;
 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
  * has the selection.
  */
-export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O & Selection<DB, TB, S>>;
+export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, SE> = SelectQueryBuilder<DB, TB, O & Selection<DB, TB, SE>>;
 /**
  * `selectAll` output query builder type.
  */
-export declare type SelectAllQueryBuilder<DB, TB extends keyof DB, O, S extends keyof DB> = QueryBuilder<DB, TB, O & RowType<DB, S>>;
-export declare type Selection<DB, TB extends keyof DB, S> = {
-    [A in ExtractAliasFromSelectExpression<S>]: ExtractTypeFromSelectExpression<DB, TB, S, A>;
+export declare type SelectAllQueryBuilder<DB, TB extends keyof DB, O, S extends keyof DB> = SelectQueryBuilder<DB, TB, O & RowType<DB, S>>;
+export declare type Selection<DB, TB extends keyof DB, SE> = {
+    [A in ExtractAliasFromSelectExpression<SE>]: ExtractTypeFromSelectExpression<DB, TB, SE, A>;
 };
-declare type ExtractAliasFromSelectExpression<S> = S extends string ? ExtractAliasFromStringSelectExpression<S> : S extends AliasedRawBuilder<any, infer RA> ? RA : S extends (qb: any) => AliasedRawBuilder<any, infer RA> ? RA : S extends AliasedQueryBuilder<any, any, any, infer QA> ? QA : S extends (qb: any) => AliasedQueryBuilder<any, any, any, infer QA> ? QA : S extends DynamicReferenceBuilder<infer RA> ? ExtractAliasFromStringSelectExpression<RA> : never;
-declare type ExtractAliasFromStringSelectExpression<S extends string> = S extends `${string}.${string}.${string} as ${infer A}` ? A : S extends `${string}.${string} as ${infer A}` ? A : S extends `${string} as ${infer A}` ? A : S extends `${string}.${string}.${infer C}` ? C : S extends `${string}.${infer C}` ? C : S;
-declare type ExtractTypeFromSelectExpression<DB, TB extends keyof DB, S, A extends keyof any> = S extends string ? ExtractTypeFromStringSelectExpression<DB, TB, S, A> : S extends AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : S extends (qb: any) => AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : S extends AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : S extends (qb: any) => AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : S extends DynamicReferenceBuilder<infer RA> ? A extends ExtractAliasFromStringSelectExpression<RA> ? ExtractTypeFromStringSelectExpression<DB, TB, RA, A> | undefined : never : never;
-declare type ExtractTypeFromStringSelectExpression<DB, TB extends keyof DB, S extends string, A extends keyof any, R = RowType<DB, TB>> = S 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 : S 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 : S extends `${infer C} as ${infer RA}` ? RA extends A ? C extends keyof R ? R[C] : never : never : S 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 : S extends `${infer T}.${infer C}` ? C extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : S extends A ? S extends keyof R ? R[S] : never : never;
+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 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 ExtractTypeFromStringSelectExpression<DB, TB extends keyof DB, SE extends string, A extends keyof any, R = RowType<DB, TB>> = 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 keyof R ? R[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 keyof R ? R[SE] : never : never;
 export declare function parseSelectExpressionOrList(ctx: ParseContext, selection: SelectExpressionOrList<any, any>): SelectionNode[];
 export declare function parseSelectAll(table?: string | string[]): SelectionNode[];
 export {};

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSelectAll = exports.parseSelectExpressionOrList = void 0;
-const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 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");
 function parseSelectExpressionOrList(ctx, selection) {
     if ((0, object_utils_js_1.isReadonlyArray)(selection)) {
         return selection.map((it) => parseSelectExpression(ctx, it));
@@ -18,14 +19,11 @@ function parseSelectExpression(ctx, selection) {
     if ((0, object_utils_js_1.isString)(selection)) {
         return selection_node_js_1.SelectionNode.create((0, reference_parser_js_1.parseAliasedStringReference)(selection));
     }
-    else if ((0, operation_node_source_js_1.isOperationNodeSource)(selection)) {
+    else if ((0, dynamic_reference_builder_js_1.isDynamicReferenceBuilder)(selection)) {
         return selection_node_js_1.SelectionNode.create(selection.toOperationNode());
     }
-    else if ((0, object_utils_js_1.isFunction)(selection)) {
-        return selection_node_js_1.SelectionNode.create(selection(ctx.createExpressionBuilder()).toOperationNode());
-    }
     else {
-        throw new Error(`invalid value passed to select method: ${JSON.stringify(selection)}`);
+        return selection_node_js_1.SelectionNode.create((0, complex_expression_parser_js_1.parseAliasedComplexExpression)(ctx, selection));
     }
 }
 function parseSelectAll(table) {
@@ -44,7 +42,5 @@ function parseSelectAllArg(table) {
     if ((0, object_utils_js_1.isString)(table)) {
         return selection_node_js_1.SelectionNode.createSelectAllFromTable(table);
     }
-    else {
-        throw new Error(`invalid value passed to selectAll method: ${JSON.stringify(table)}`);
-    }
+    throw new Error(`invalid value selectAll expression: ${JSON.stringify(table)}`);
 }

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

@@ -1,32 +1,30 @@
-import { AliasedQueryBuilder, QueryBuilder } from '../query-builder/query-builder.js';
+import { AliasedQueryBuilder } from '../query-builder/select-query-builder.js';
 import { TableNode } from '../operation-node/table-node.js';
-import { AliasedQueryBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, Nullable } from '../util/type-utils.js';
+import { AnyAliasedRawBuilder, Nullable } from '../util/type-utils.js';
 import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
 import { TableExpressionNode } from '../operation-node/operation-node-utils.js';
 import { ParseContext } from './parse-context.js';
-export declare type TableExpression<DB, TB extends keyof DB> = TableReference<DB> | AnyAliasedQueryBuilder | AliasedQueryBuilderFactory<DB, TB>;
+import { AliasedComplexExpression } from './complex-expression-parser.js';
+export declare type TableExpression<DB, TB extends keyof DB> = TableReference<DB> | AliasedComplexExpression<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, any, any> | AnyTable<DB> | AnyAliasedRawBuilder;
-export declare type QueryBuilderWithTable<DB, TB extends keyof DB, O, TE> = QueryBuilder<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>, O>;
+export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AnyAliasedRawBuilder;
 export declare type TableExpressionDatabase<DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
     [C in keyof DB | A]: C extends A ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? DB[C] : never;
 };
-export declare type QueryBuilderWithLeftJoin<DB, TB extends keyof DB, O, TE> = QueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>, O>;
 export declare type LeftJoinTableExpressionDatabase<DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
     [C in keyof DB | A]: C extends A ? Nullable<ExtractRowTypeFromTableExpression<DB, TE, C>> : C extends keyof DB ? DB[C] : never;
 };
-export declare type QueryBuilderWithRightJoin<DB, TB extends keyof DB, O, TE> = QueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>, O>;
 export declare type RightJoinTableExpressionDatabase<DB, TB extends keyof DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
     [C in keyof DB | A]: C extends A ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? C extends TB ? Nullable<DB[C]> : DB[C] : never;
 };
-export declare type QueryBuilderWithFullJoin<DB, TB extends keyof DB, O, TE> = QueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>, O>;
 export declare type FullJoinTableExpressionDatabase<DB, TB extends keyof DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
     [C in keyof DB | A]: C extends A ? Nullable<ExtractRowTypeFromTableExpression<DB, TE, C>> : C extends keyof DB ? C extends TB ? Nullable<DB[C]> : DB[C] : never;
 };
 export 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 : never;
-declare type AnyAliasedTable<DB, TB extends keyof DB, A extends string> = TB extends string ? `${TB} as ${A}` : never;
-declare type AnyTable<DB> = keyof DB;
+export declare type TableExpressionTables<DB, TB extends keyof DB, TE> = TB | ExtractAliasFromTableExpression<DB, TE>;
+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 AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
+declare type AnyTable<DB> = keyof DB & string;
 export declare function parseTableExpressionOrList(ctx: ParseContext, table: TableExpressionOrList<any, any>): TableExpressionNode[];
 export declare function parseTableExpression(ctx: ParseContext, table: TableExpression<any, any>): TableExpressionNode;
 export declare function parseAliasedTable(from: string): TableExpressionNode;

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

@@ -4,7 +4,7 @@ exports.parseTable = exports.parseAliasedTable = exports.parseTableExpression =
 const object_utils_js_1 = require("../util/object-utils.js");
 const alias_node_js_1 = require("../operation-node/alias-node.js");
 const table_node_js_1 = require("../operation-node/table-node.js");
-const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
+const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
 function parseTableExpressionOrList(ctx, table) {
     if ((0, object_utils_js_1.isReadonlyArray)(table)) {
         return table.map((it) => parseTableExpression(ctx, it));
@@ -18,14 +18,8 @@ function parseTableExpression(ctx, table) {
     if ((0, object_utils_js_1.isString)(table)) {
         return parseAliasedTable(table);
     }
-    else if ((0, operation_node_source_js_1.isOperationNodeSource)(table)) {
-        return table.toOperationNode();
-    }
-    else if ((0, object_utils_js_1.isFunction)(table)) {
-        return table(ctx.createExpressionBuilder()).toOperationNode();
-    }
     else {
-        throw new Error(`invalid table expression ${JSON.stringify(table)}`);
+        return (0, complex_expression_parser_js_1.parseAliasedComplexExpression)(ctx, table);
     }
 }
 exports.parseTableExpression = parseTableExpression;