kysely 0.23.4 → 0.24.0

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

@@ -1,9 +1,16 @@
 import { OperationNode } from './operation-node.js';
-export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "&&", "||", "@@", "@@@", "!!", "<->"];
+export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->"];
+export declare const ARITHMETIC_OPERATORS: readonly ["+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>"];
+export declare const BINARY_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||"];
 export declare const UNARY_FILTER_OPERATORS: readonly ["exists", "not exists"];
+export declare const UNARY_OPERATORS: readonly ["not", "-", "exists", "not exists"];
+export declare const OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||", "not", "-", "exists", "not exists"];
 export declare type ComparisonOperator = typeof COMPARISON_OPERATORS[number];
+export declare type ArithmeticOperator = typeof ARITHMETIC_OPERATORS[number];
+export declare type BinaryOperator = typeof BINARY_OPERATORS[number];
+export declare type UnaryOperator = typeof UNARY_OPERATORS[number];
 export declare type UnaryFilterOperator = typeof UNARY_FILTER_OPERATORS[number];
-export declare type Operator = ComparisonOperator | UnaryFilterOperator;
+export declare type Operator = typeof OPERATORS[number];
 export interface OperatorNode extends OperationNode {
     readonly kind: 'OperatorNode';
     readonly operator: Operator;
@@ -15,3 +22,7 @@ export declare const OperatorNode: Readonly<{
     is(node: OperationNode): node is OperatorNode;
     create(operator: Operator): OperatorNode;
 }>;
+export declare function isOperator(op: unknown): op is Operator;
+export declare function isBinaryOperator(op: unknown): op is BinaryOperator;
+export declare function isComparisonOperator(op: unknown): op is ComparisonOperator;
+export declare function isArithmeticOperator(op: unknown): op is ArithmeticOperator;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OperatorNode = exports.UNARY_FILTER_OPERATORS = exports.COMPARISON_OPERATORS = void 0;
+exports.isArithmeticOperator = exports.isComparisonOperator = exports.isBinaryOperator = exports.isOperator = exports.OperatorNode = exports.OPERATORS = exports.UNARY_OPERATORS = exports.UNARY_FILTER_OPERATORS = exports.BINARY_OPERATORS = exports.ARITHMETIC_OPERATORS = exports.COMPARISON_OPERATORS = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
 exports.COMPARISON_OPERATORS = [
     '=',
@@ -31,14 +31,33 @@ exports.COMPARISON_OPERATORS = [
     '~',
     '~*',
     '!~*',
-    '&&',
-    '||',
     '@@',
     '@@@',
     '!!',
     '<->',
 ];
+exports.ARITHMETIC_OPERATORS = [
+    '+',
+    '-',
+    '*',
+    '/',
+    '%',
+    '^',
+    '&',
+    '|',
+    '#',
+    '<<',
+    '>>',
+];
+exports.BINARY_OPERATORS = [
+    ...exports.COMPARISON_OPERATORS,
+    ...exports.ARITHMETIC_OPERATORS,
+    '&&',
+    '||',
+];
 exports.UNARY_FILTER_OPERATORS = ['exists', 'not exists'];
+exports.UNARY_OPERATORS = ['not', '-', ...exports.UNARY_FILTER_OPERATORS];
+exports.OPERATORS = [...exports.BINARY_OPERATORS, ...exports.UNARY_OPERATORS];
 /**
  * @internal
  */
@@ -53,3 +72,19 @@ exports.OperatorNode = (0, object_utils_js_1.freeze)({
         });
     },
 });
+function isOperator(op) {
+    return (0, object_utils_js_1.isString)(op) && exports.OPERATORS.includes(op);
+}
+exports.isOperator = isOperator;
+function isBinaryOperator(op) {
+    return (0, object_utils_js_1.isString)(op) && exports.BINARY_OPERATORS.includes(op);
+}
+exports.isBinaryOperator = isBinaryOperator;
+function isComparisonOperator(op) {
+    return (0, object_utils_js_1.isString)(op) && exports.COMPARISON_OPERATORS.includes(op);
+}
+exports.isComparisonOperator = isComparisonOperator;
+function isArithmeticOperator(op) {
+    return (0, object_utils_js_1.isString)(op) && exports.ARITHMETIC_OPERATORS.includes(op);
+}
+exports.isArithmeticOperator = isArithmeticOperator;

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

@@ -2,20 +2,37 @@ import { InsertQueryNode } from './insert-query-node.js';
 import { SelectQueryNode } from './select-query-node.js';
 import { UpdateQueryNode } from './update-query-node.js';
 import { DeleteQueryNode } from './delete-query-node.js';
+import { WhereNode } from './where-node.js';
 import { JoinNode } from './join-node.js';
 import { SelectionNode } from './selection-node.js';
+import { ReturningNode } from './returning-node.js';
 import { OperationNode } from './operation-node.js';
-export declare type QueryNode = SelectQueryNode | DeleteQueryNode | InsertQueryNode | UpdateQueryNode;
-export declare type MutatingQueryNode = DeleteQueryNode | InsertQueryNode | UpdateQueryNode;
-export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | UpdateQueryNode;
+import { ExplainNode } from './explain-node.js';
+import { ExplainFormat } from '../util/explainable.js';
+import { Expression } from '../expression/expression.js';
+export declare type QueryNode = SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode;
+declare type HasJoins = {
+    joins?: ReadonlyArray<JoinNode>;
+};
+declare type HasWhere = {
+    where?: WhereNode;
+};
+declare type HasReturning = {
+    returning?: ReturningNode;
+};
+declare type HasExplain = {
+    explain?: ExplainNode;
+};
 /**
  * @internal
  */
 export declare const QueryNode: Readonly<{
     is(node: OperationNode): node is QueryNode;
-    cloneWithWhere<T extends FilterableQueryNode>(node: T, operation: OperationNode): T;
-    cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, operation: OperationNode): T_1;
-    cloneWithJoin<T_2 extends FilterableQueryNode>(node: T_2, join: JoinNode): T_2;
-    cloneWithReturning<T_3 extends MutatingQueryNode>(node: T_3, selections: ReadonlyArray<SelectionNode>): T_3;
-    cloneWithoutWhere<T_4 extends FilterableQueryNode>(node: T_4): T_4;
+    cloneWithWhere<T extends HasWhere>(node: T, operation: OperationNode): T;
+    cloneWithOrWhere<T_1 extends HasWhere>(node: T_1, operation: OperationNode): T_1;
+    cloneWithJoin<T_2 extends HasJoins>(node: T_2, join: JoinNode): T_2;
+    cloneWithReturning<T_3 extends HasReturning>(node: T_3, selections: ReadonlyArray<SelectionNode>): T_3;
+    cloneWithoutWhere<T_4 extends HasWhere>(node: T_4): T_4;
+    cloneWithExplain<T_5 extends HasExplain>(node: T_5, format: ExplainFormat | undefined, options: Expression<any> | undefined): T_5;
 }>;
+export {};

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

@@ -8,15 +8,16 @@ const delete_query_node_js_1 = require("./delete-query-node.js");
 const where_node_js_1 = require("./where-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const returning_node_js_1 = require("./returning-node.js");
+const explain_node_js_1 = require("./explain-node.js");
 /**
  * @internal
  */
 exports.QueryNode = (0, object_utils_js_1.freeze)({
     is(node) {
-        return (delete_query_node_js_1.DeleteQueryNode.is(node) ||
+        return (select_query_node_js_1.SelectQueryNode.is(node) ||
             insert_query_node_js_1.InsertQueryNode.is(node) ||
             update_query_node_js_1.UpdateQueryNode.is(node) ||
-            select_query_node_js_1.SelectQueryNode.is(node));
+            delete_query_node_js_1.DeleteQueryNode.is(node));
     },
     cloneWithWhere(node, operation) {
         return (0, object_utils_js_1.freeze)({
@@ -54,4 +55,10 @@ exports.QueryNode = (0, object_utils_js_1.freeze)({
             where: undefined,
         });
     },
+    cloneWithExplain(node, format, options) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            explain: explain_node_js_1.ExplainNode.create(format, options?.toOperationNode()),
+        });
+    },
 });

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

@@ -49,7 +49,6 @@ export declare const SelectQueryNode: Readonly<{
     cloneWithHaving(selectNode: SelectQueryNode, operation: OperationNode): SelectQueryNode;
     cloneWithOrHaving(selectNode: SelectQueryNode, operation: OperationNode): SelectQueryNode;
     cloneWithSetOperation(selectNode: SelectQueryNode, setOperation: SetOperationNode): SelectQueryNode;
-    cloneWithExplain(selectNode: SelectQueryNode, explain: ExplainNode): SelectQueryNode;
     cloneWithoutSelections(select: SelectQueryNode): SelectQueryNode;
     cloneWithoutLimit(select: SelectQueryNode): SelectQueryNode;
     cloneWithoutOffset(select: SelectQueryNode): SelectQueryNode;

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

@@ -104,12 +104,6 @@ exports.SelectQueryNode = (0, object_utils_js_1.freeze)({
                 : (0, object_utils_js_1.freeze)([setOperation]),
         });
     },
-    cloneWithExplain(selectNode, explain) {
-        return (0, object_utils_js_1.freeze)({
-            ...selectNode,
-            explain,
-        });
-    },
     cloneWithoutSelections(select) {
         return (0, object_utils_js_1.freeze)({
             ...select,

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

@@ -28,5 +28,4 @@ export declare const UpdateQueryNode: Readonly<{
     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/update-query-node.js

@@ -33,10 +33,4 @@ exports.UpdateQueryNode = (0, object_utils_js_1.freeze)({
                 : updates,
         });
     },
-    cloneWithExplain(updateQuery, explain) {
-        return (0, object_utils_js_1.freeze)({
-            ...updateQuery,
-            explain,
-        });
-    },
 });

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

@@ -1,20 +1,19 @@
 import { BinaryOperationNode } from '../operation-node/binary-operation-node.js';
-import { ComparisonOperator } from '../operation-node/operator-node.js';
+import { ComparisonOperator, ArithmeticOperator, BinaryOperator, Operator } 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> | null>;
-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 type OperatorExpression = Operator | Expression<unknown>;
+export declare type BinaryOperatorExpression = BinaryOperator | Expression<unknown>;
+export declare type ComparisonOperatorExpression = ComparisonOperator | Expression<unknown>;
+export declare type ArithmeticOperatorExpression = ArithmeticOperator | Expression<unknown>;
+export declare function parseValueBinaryOperation(leftOperand: ReferenceExpression<any, any>, operator: BinaryOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;
+export declare function parseReferentialBinaryOperation(leftOperand: ReferenceExpression<any, any>, operator: BinaryOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;
+export declare function parseValueComparison(leftOperand: ReferenceExpression<any, any>, operator: ComparisonOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;
+export declare function parseReferentialComparison(leftOperand: ReferenceExpression<any, any>, operator: ComparisonOperatorExpression, rightOperand: ReferenceExpression<any, any>): BinaryOperationNode;
 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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFilterExpression = exports.parseReferentialFilter = exports.parseOn = exports.parseHaving = exports.parseWhere = void 0;
+exports.parseOn = exports.parseHaving = exports.parseWhere = exports.parseReferentialComparison = exports.parseValueComparison = exports.parseReferentialBinaryOperation = exports.parseValueBinaryOperation = void 0;
 const binary_operation_node_js_1 = require("../operation-node/binary-operation-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
@@ -11,54 +11,80 @@ 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");
+const select_query_node_js_1 = require("../operation-node/select-query-node.js");
+const join_node_js_1 = require("../operation-node/join-node.js");
+const expression_builder_js_1 = require("../expression/expression-builder.js");
+function parseValueBinaryOperation(leftOperand, operator, rightOperand) {
+    if (!(0, operator_node_js_1.isBinaryOperator)(operator) && !(0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
+        throw new Error(`invalid binary operator ${JSON.stringify(operator)}`);
+    }
+    if (isIsComparison(operator, rightOperand)) {
+        return parseIs(leftOperand, operator, rightOperand);
+    }
+    return binary_operation_node_js_1.BinaryOperationNode.create((0, reference_parser_js_1.parseReferenceExpression)(leftOperand), parseOperator(operator), (0, value_parser_js_1.parseValueExpressionOrList)(rightOperand));
+}
+exports.parseValueBinaryOperation = parseValueBinaryOperation;
+function parseReferentialBinaryOperation(leftOperand, operator, rightOperand) {
+    if (!(0, operator_node_js_1.isBinaryOperator)(operator) && !(0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
+        throw new Error(`invalid binary operator ${JSON.stringify(operator)}`);
+    }
+    return binary_operation_node_js_1.BinaryOperationNode.create((0, reference_parser_js_1.parseReferenceExpression)(leftOperand), parseOperator(operator), (0, reference_parser_js_1.parseReferenceExpression)(rightOperand));
+}
+exports.parseReferentialBinaryOperation = parseReferentialBinaryOperation;
+function parseValueComparison(leftOperand, operator, rightOperand) {
+    if (!(0, operator_node_js_1.isComparisonOperator)(operator) && !(0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
+        throw new Error(`invalid comparison operator ${JSON.stringify(operator)}`);
+    }
+    return parseValueBinaryOperation(leftOperand, operator, rightOperand);
+}
+exports.parseValueComparison = parseValueComparison;
+function parseReferentialComparison(leftOperand, operator, rightOperand) {
+    if (!(0, operator_node_js_1.isComparisonOperator)(operator) && !(0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
+        throw new Error(`invalid comparison operator ${JSON.stringify(operator)}`);
+    }
+    return parseReferentialBinaryOperation(leftOperand, operator, rightOperand);
+}
+exports.parseReferentialComparison = parseReferentialComparison;
 function parseWhere(args) {
-    return parseFilterExpression('where', args);
+    return parseFilter('where', args);
 }
 exports.parseWhere = parseWhere;
 function parseHaving(args) {
-    return parseFilterExpression('having', args);
+    return parseFilter('having', args);
 }
 exports.parseHaving = parseHaving;
 function parseOn(args) {
-    return parseFilterExpression('on', args);
+    return parseFilter('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) {
+function parseFilter(type, args) {
     if (args.length === 3) {
-        return parseFilter(args[0], args[1], args[2]);
+        return parseValueComparison(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 isIsComparison(operator, rightOperand) {
+    return ((operator === 'is' || operator === 'is not') &&
+        ((0, object_utils_js_1.isNull)(rightOperand) || (0, object_utils_js_1.isBoolean)(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));
+    return binary_operation_node_js_1.BinaryOperationNode.create((0, reference_parser_js_1.parseReferenceExpression)(leftOperand), parseOperator(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)) {
+function parseOperator(operator) {
+    if ((0, object_utils_js_1.isString)(operator) && operator_node_js_1.OPERATORS.includes(operator)) {
         return operator_node_js_1.OperatorNode.create(operator);
     }
-    else if ((0, operation_node_source_js_1.isOperationNodeSource)(operator)) {
+    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`);
+    throw new Error(`invalid operator ${JSON.stringify(operator)}`);
 }
 function parseOneArgFilterExpression(type, arg) {
     if ((0, object_utils_js_1.isFunction)(arg)) {
-        return GROUP_PARSERS[type](arg);
+        return CALLBACK_PARSERS[type](arg);
     }
     else if ((0, operation_node_source_js_1.isOperationNodeSource)(arg)) {
         const node = arg.toOperationNode();
@@ -71,29 +97,53 @@ function parseOneArgFilterExpression(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)({
+const CALLBACK_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');
+        // TODO: Remove this once the grouper overload is removed.
+        const whereBuilder = (0, parse_utils_js_1.createSelectQueryBuilder)();
+        const exprBuilder = (0, expression_builder_js_1.expressionBuilder)();
+        const res = callback(Object.assign(whereBuilder, exprBuilder));
+        const node = res.toOperationNode();
+        if (select_query_node_js_1.SelectQueryNode.is(node)) {
+            if (!node.where) {
+                throw new Error('no `where` methods called inside a group callback');
+            }
+            return parens_node_js_1.ParensNode.create(node.where.where);
+        }
+        else {
+            return node;
         }
-        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');
+        // TODO: Remove this once the grouper overload is removed.
+        const havingBuilder = (0, parse_utils_js_1.createSelectQueryBuilder)();
+        const exprBuilder = (0, expression_builder_js_1.expressionBuilder)();
+        const res = callback(Object.assign(havingBuilder, exprBuilder));
+        const node = res.toOperationNode();
+        if (select_query_node_js_1.SelectQueryNode.is(node)) {
+            if (!node.having) {
+                throw new Error('no `having` methods called inside a group callback');
+            }
+            return parens_node_js_1.ParensNode.create(node.having.having);
+        }
+        else {
+            return node;
         }
-        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');
+        // TODO: Remove this once the grouper overload is removed.
+        const onBuilder = (0, parse_utils_js_1.createJoinBuilder)('InnerJoin', 'table');
+        const exprBuilder = (0, expression_builder_js_1.expressionBuilder)();
+        const res = callback(Object.assign(onBuilder, exprBuilder));
+        const node = res.toOperationNode();
+        if (join_node_js_1.JoinNode.is(node)) {
+            if (!node.on) {
+                throw new Error('no `on` methods called inside a group callback');
+            }
+            return parens_node_js_1.ParensNode.create(node.on.on);
+        }
+        else {
+            return node;
         }
-        return parens_node_js_1.ParensNode.create(joinNode.on.on);
     },
 });

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

@@ -1,4 +1,2 @@
-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

@@ -1,11 +1,2 @@
 "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/expression-parser.d.ts

@@ -1,10 +1,14 @@
 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 { ExpressionBuilder } from '../expression/expression-builder.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
-export declare type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, Record<string, V>> | ((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 type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, Record<string, V>> | SelectQueryBuilderFactory<DB, TB, Record<string, V>> | Expression<V> | ExpressionFactory<DB, TB, V>;
+export declare type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | AliasedExpressionFactory<DB, TB>;
+declare type SelectQueryBuilderFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, V>;
+declare type ExpressionFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => Expression<V>;
+declare type AliasedExpressionFactory<DB, TB extends keyof DB> = (eb: 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>;
+export {};

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 expression_builder_js_1 = require("../expression/expression-builder.js");
 const object_utils_js_1 = require("../util/object-utils.js");
-const parse_utils_js_1 = require("./parse-utils.js");
 function parseExpression(exp) {
     if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
         return exp.toOperationNode();
     }
     else if ((0, object_utils_js_1.isFunction)(exp)) {
-        return exp((0, parse_utils_js_1.createExpressionBuilder)()).toOperationNode();
+        return exp((0, expression_builder_js_1.expressionBuilder)()).toOperationNode();
     }
     throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
 }
@@ -20,12 +20,12 @@ function parseAliasedExpression(exp) {
         return exp.toOperationNode();
     }
     else if ((0, object_utils_js_1.isFunction)(exp)) {
-        return exp((0, parse_utils_js_1.createExpressionBuilder)()).toOperationNode();
+        return exp((0, expression_builder_js_1.expressionBuilder)()).toOperationNode();
     }
     throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
 }
 exports.parseAliasedExpression = parseAliasedExpression;
 function isExpressionOrFactory(obj) {
-    return (0, expression_js_1.isExpression)(obj) || (0, object_utils_js_1.isFunction)(obj);
+    return (0, expression_js_1.isExpression)(obj) || (0, expression_js_1.isAliasedExpression)(obj) || (0, object_utils_js_1.isFunction)(obj);
 }
 exports.isExpressionOrFactory = isExpressionOrFactory;

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

@@ -1,5 +1,6 @@
 import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
+import { ExpressionBuilder } from '../expression/expression-builder.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(groupBy: GroupByExpressionOrList<any, any, any>): GroupByItemNode[];
+export declare type GroupByArg<DB, TB extends keyof DB, O> = GroupByExpression<DB, TB, O> | ReadonlyArray<GroupByExpression<DB, TB, O>> | ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<GroupByExpression<DB, TB, O>>);
+export declare function parseGroupBy(groupBy: GroupByArg<any, any, any>): GroupByItemNode[];

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

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseGroupBy = void 0;
 const group_by_item_node_js_1 = require("../operation-node/group-by-item-node.js");
+const expression_builder_js_1 = require("../expression/expression-builder.js");
+const object_utils_js_1 = require("../util/object-utils.js");
 const reference_parser_js_1 = require("./reference-parser.js");
 function parseGroupBy(groupBy) {
+    groupBy = (0, object_utils_js_1.isFunction)(groupBy) ? groupBy((0, expression_builder_js_1.expressionBuilder)()) : groupBy;
     return (0, reference_parser_js_1.parseReferenceExpressionOrList)(groupBy).map(group_by_item_node_js_1.GroupByItemNode.create);
 }
 exports.parseGroupBy = parseGroupBy;

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

@@ -2,10 +2,13 @@ import { ColumnNode } from '../operation-node/column-node.js';
 import { ValueExpression } from './value-parser.js';
 import { ValuesNode } from '../operation-node/values-node.js';
 import { NonNullableInsertKeys, NullableInsertKeys, InsertType } from '../util/column-type.js';
+import { ExpressionBuilder } from '../expression/expression-builder.js';
 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]>> | 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];
+export declare type InsertObjectOrListFactory<DB, TB extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => InsertObjectOrList<DB, TB>;
+export declare type InsertExpression<DB, TB extends keyof DB> = InsertObjectOrList<DB, TB> | InsertObjectOrListFactory<DB, TB>;
+export declare function parseInsertExpression(arg: InsertExpression<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseInsertObjectOrList = void 0;
+exports.parseInsertExpression = void 0;
 const column_node_js_1 = require("../operation-node/column-node.js");
 const primitive_value_list_node_js_1 = require("../operation-node/primitive-value-list-node.js");
 const value_list_node_js_1 = require("../operation-node/value-list-node.js");
@@ -9,10 +9,15 @@ const value_parser_js_1 = require("./value-parser.js");
 const values_node_js_1 = require("../operation-node/values-node.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]);
+const expression_builder_js_1 = require("../expression/expression-builder.js");
+function parseInsertExpression(arg) {
+    const objectOrList = (0, object_utils_js_1.isFunction)(arg) ? arg((0, expression_builder_js_1.expressionBuilder)()) : arg;
+    const list = (0, object_utils_js_1.isReadonlyArray)(objectOrList)
+        ? objectOrList
+        : (0, object_utils_js_1.freeze)([objectOrList]);
+    return parseInsertColumnsAndValues(list);
 }
-exports.parseInsertObjectOrList = parseInsertObjectOrList;
+exports.parseInsertExpression = parseInsertExpression;
 function parseInsertColumnsAndValues(rows) {
     const columns = parseColumnNamesAndIndexes(rows);
     return [
@@ -37,19 +42,20 @@ function parseRowValues(row, columns) {
     const rowValues = Array.from({
         length: columns.size,
     });
-    let complexColumn = false;
+    let hasUndefinedOrComplexColumns = false;
     for (const col of rowColumns) {
         const columnIdx = columns.get(col);
-        if (columnIdx !== undefined) {
-            const value = row[col];
-            if ((0, expression_parser_js_1.isExpressionOrFactory)(value)) {
-                complexColumn = true;
-            }
-            rowValues[columnIdx] = value;
+        if ((0, object_utils_js_1.isUndefined)(columnIdx)) {
+            continue;
+        }
+        const value = row[col];
+        if ((0, object_utils_js_1.isUndefined)(value) || (0, expression_parser_js_1.isExpressionOrFactory)(value)) {
+            hasUndefinedOrComplexColumns = true;
         }
+        rowValues[columnIdx] = value;
     }
-    const columnMissing = rowColumns.length < columns.size;
-    if (columnMissing || complexColumn) {
+    const hasMissingColumns = rowColumns.length < columns.size;
+    if (hasMissingColumns || hasUndefinedOrComplexColumns) {
         const defaultValue = default_insert_value_node_js_1.DefaultInsertValueNode.create();
         return value_list_node_js_1.ValueListNode.create(rowValues.map((it) => (0, object_utils_js_1.isUndefined)(it) ? defaultValue : (0, value_parser_js_1.parseValueExpression)(it)));
     }

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

@@ -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, binary_operation_parser_js_1.parseReferentialFilter)(lhsColumn, '=', rhsColumn));
+    return join_node_js_1.JoinNode.createWithOn(joinType, (0, table_parser_js_1.parseTableExpression)(from), (0, binary_operation_parser_js_1.parseReferentialComparison)(lhsColumn, '=', rhsColumn));
 }

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

@@ -1,12 +1,10 @@
 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';
 export declare function createSelectQueryBuilder(): SelectQueryBuilder<any, 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>;