kysely 0.23.4 → 0.24.0

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOverBuilder = exports.createJoinBuilder = exports.createQueryCreator = exports.createExpressionBuilder = exports.createSelectQueryBuilder = void 0;
+exports.createOverBuilder = exports.createJoinBuilder = exports.createQueryCreator = exports.createSelectQueryBuilder = void 0;
 const join_node_js_1 = require("../operation-node/join-node.js");
 const over_node_js_1 = require("../operation-node/over-node.js");
 const select_query_node_js_1 = require("../operation-node/select-query-node.js");
-const expression_builder_js_1 = require("../query-builder/expression-builder.js");
 const join_builder_js_1 = require("../query-builder/join-builder.js");
 const over_builder_js_1 = require("../query-builder/over-builder.js");
 const select_query_builder_js_1 = require("../query-builder/select-query-builder.js");
@@ -20,12 +19,6 @@ function createSelectQueryBuilder() {
     });
 }
 exports.createSelectQueryBuilder = createSelectQueryBuilder;
-function createExpressionBuilder() {
-    return new expression_builder_js_1.ExpressionBuilder({
-        executor: noop_query_executor_js_1.NOOP_QUERY_EXECUTOR,
-    });
-}
-exports.createExpressionBuilder = createExpressionBuilder;
 function createQueryCreator() {
     return new query_creator_js_1.QueryCreator({
         executor: noop_query_executor_js_1.NOOP_QUERY_EXECUTOR,

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

@@ -1,5 +1,6 @@
 import { DeleteResult } from '../query-builder/delete-result.js';
 import { InsertResult } from '../query-builder/insert-result.js';
 import { UpdateResult } from '../query-builder/update-result.js';
-import { Selection } from './select-parser.js';
+import { Selection, AllSelection } from './select-parser.js';
 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>;
+export declare type ReturningAllRow<DB, TB extends keyof DB, O> = O extends InsertResult ? AllSelection<DB, TB> : O extends DeleteResult ? AllSelection<DB, TB> : O extends UpdateResult ? AllSelection<DB, TB> : O & AllSelection<DB, TB>;

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

@@ -1,21 +1,13 @@
-import { AliasedSelectQueryBuilder, SelectQueryBuilder } from '../query-builder/select-query-builder.js';
+import { AliasedSelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { SelectionNode } from '../operation-node/selection-node.js';
 import { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, ExtractColumnType, ValueType } from '../util/type-utils.js';
 import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
 import { AliasedExpressionOrFactory } from './expression-parser.js';
 import { Selectable, SelectType } from '../util/column-type.js';
 import { AliasedExpression } from '../expression/expression.js';
+import { ExpressionBuilder } from '../expression/expression-builder.js';
 export declare type SelectExpression<DB, TB extends keyof DB> = AnyAliasedColumnWithTable<DB, TB> | AnyAliasedColumn<DB, TB> | AnyColumnWithTable<DB, TB> | AnyColumn<DB, TB> | DynamicReferenceBuilder<any> | AliasedExpressionOrFactory<DB, TB>;
-export declare type 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, 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> = SelectQueryBuilder<DB, TB, O & AllSelection<DB, S>>;
+export declare type SelectArg<DB, TB extends keyof DB, SE extends SelectExpression<DB, TB>> = SE | ReadonlyArray<SE> | ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<SE>);
 export declare type Selection<DB, TB extends keyof DB, SE> = {
     [A in ExtractAliasFromSelectExpression<SE>]: SelectType<ExtractTypeFromSelectExpression<DB, TB, SE, A>>;
 };
@@ -23,11 +15,11 @@ declare type ExtractAliasFromSelectExpression<SE> = SE extends string ? ExtractA
 declare type ExtractAliasFromStringSelectExpression<SE extends string> = SE extends `${string}.${string}.${string} as ${infer A}` ? A : SE extends `${string}.${string} as ${infer A}` ? A : SE extends `${string} as ${infer A}` ? A : SE extends `${string}.${string}.${infer C}` ? C : SE extends `${string}.${infer C}` ? C : SE;
 declare type ExtractTypeFromSelectExpression<DB, TB extends keyof DB, SE, A extends keyof any> = SE extends string ? ExtractTypeFromStringSelectExpression<DB, TB, SE, A> : SE extends AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends (qb: any) => AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends (qb: any) => AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends DynamicReferenceBuilder<infer RA> ? A extends ExtractAliasFromStringSelectExpression<RA> ? ExtractTypeFromStringSelectExpression<DB, TB, RA, A> | undefined : never : never;
 declare type 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<{
+export declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
     [C in AnyColumn<DB, TB>]: {
         [T in TB]: C extends keyof DB[T] ? DB[T][C] : never;
     }[TB];
 }>;
-export declare function parseSelectExpressionOrList(selection: SelectExpressionOrList<any, any>): SelectionNode[];
+export declare function parseSelectArg(selection: SelectArg<any, any, SelectExpression<any, any>>): SelectionNode[];
 export declare function parseSelectAll(table?: string | string[]): SelectionNode[];
 export {};

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

@@ -1,21 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSelectAll = exports.parseSelectExpressionOrList = void 0;
+exports.parseSelectAll = exports.parseSelectArg = void 0;
 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 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)) {
+const expression_builder_js_1 = require("../expression/expression-builder.js");
+function parseSelectArg(selection) {
+    if ((0, object_utils_js_1.isFunction)(selection)) {
+        return parseSelectArg(selection((0, expression_builder_js_1.expressionBuilder)()));
+    }
+    else if ((0, object_utils_js_1.isReadonlyArray)(selection)) {
         return selection.map((it) => parseSelectExpression(it));
     }
     else {
         return [parseSelectExpression(selection)];
     }
 }
-exports.parseSelectExpressionOrList = parseSelectExpressionOrList;
+exports.parseSelectArg = parseSelectArg;
 function parseSelectExpression(selection) {
     if ((0, object_utils_js_1.isString)(selection)) {
         return selection_node_js_1.SelectionNode.create((0, reference_parser_js_1.parseAliasedStringReference)(selection));

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

@@ -3,16 +3,19 @@ import { TableNode } from '../operation-node/table-node.js';
 import { AliasedExpressionOrFactory } from './expression-parser.js';
 import { OperationNode } from '../operation-node/operation-node.js';
 import { AliasedExpression } from '../expression/expression.js';
-export declare type TableExpression<DB, TB extends keyof DB> = TableReference<DB> | AliasedExpressionOrFactory<DB, TB>;
+export declare type TableExpression<DB, TB extends keyof DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpressionOrFactory<DB, TB>;
 export declare type TableExpressionOrList<DB, TB extends keyof DB> = TableExpression<DB, TB> | ReadonlyArray<TableExpression<DB, TB>>;
 export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpression<any, any>;
+export declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
+export declare type TableReferenceOrList<DB> = TableReference<DB> | ReadonlyArray<TableReference<DB>>;
 export declare type From<DB, TE> = {
     [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 AliasedExpression<any, infer QA> ? QA : TE extends (qb: any) => AliasedExpression<any, infer QA> ? QA : never;
+export declare type ExtractTableAlias<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : never;
+export declare type PickTableWithAlias<DB, T extends AnyAliasedTable<DB>> = T extends `${infer TB} as ${infer A}` ? TB extends keyof DB ? Record<A, DB[TB]> : never : never;
+declare type ExtractAliasFromTableExpression<DB, TE> = TE extends string ? ExtractTableAlias<DB, TE> : TE extends AliasedExpression<any, infer QA> ? QA : TE extends (qb: any) => AliasedExpression<any, infer QA> ? QA : never;
 declare type ExtractRowTypeFromTableExpression<DB, TE, A extends keyof any> = TE extends `${infer T} as ${infer TA}` ? TA extends A ? T extends keyof DB ? DB[T] : never : never : TE extends A ? TE extends keyof DB ? DB[TE] : never : TE extends AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : never;
-declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
 declare type AnyTable<DB> = keyof DB & string;
 export declare function parseTableExpressionOrList(table: TableExpressionOrList<any, any>): OperationNode[];
 export declare function parseTableExpression(table: TableExpression<any, any>): OperationNode;

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

@@ -1,5 +1,8 @@
+import { UnaryOperator } from '../operation-node/operator-node.js';
 import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
 import { ExpressionOrFactory } from './expression-parser.js';
+import { ReferenceExpression } from './reference-parser.js';
 export declare type ExistsExpression<DB, TB extends keyof DB> = ExpressionOrFactory<DB, TB, any>;
-export declare function parseExists(arg: ExistsExpression<any, any>): UnaryOperationNode;
-export declare function parseNotExists(arg: ExistsExpression<any, any>): UnaryOperationNode;
+export declare function parseExists(operand: ExistsExpression<any, any>): UnaryOperationNode;
+export declare function parseNotExists(operand: ExistsExpression<any, any>): UnaryOperationNode;
+export declare function parseUnaryOperation(operator: UnaryOperator, operand: ReferenceExpression<any, any>): UnaryOperationNode;

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

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNotExists = exports.parseExists = void 0;
+exports.parseUnaryOperation = exports.parseNotExists = exports.parseExists = void 0;
 const operator_node_js_1 = require("../operation-node/operator-node.js");
 const unary_operation_node_js_1 = require("../operation-node/unary-operation-node.js");
-const value_parser_js_1 = require("./value-parser.js");
-function parseExists(arg) {
-    return parseUnaryOperation('exists', arg);
+const reference_parser_js_1 = require("./reference-parser.js");
+function parseExists(operand) {
+    return parseUnaryOperation('exists', operand);
 }
 exports.parseExists = parseExists;
-function parseNotExists(arg) {
-    return parseUnaryOperation('not exists', arg);
+function parseNotExists(operand) {
+    return parseUnaryOperation('not exists', operand);
 }
 exports.parseNotExists = parseNotExists;
-function parseUnaryOperation(type, arg) {
-    return unary_operation_node_js_1.UnaryOperationNode.create(operator_node_js_1.OperatorNode.create(type), (0, value_parser_js_1.parseValueExpressionOrList)(arg));
+function parseUnaryOperation(operator, operand) {
+    return unary_operation_node_js_1.UnaryOperationNode.create(operator_node_js_1.OperatorNode.create(operator), (0, reference_parser_js_1.parseReferenceExpression)(operand));
 }
+exports.parseUnaryOperation = parseUnaryOperation;

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

@@ -1,7 +1,10 @@
 import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
+import { ExpressionBuilder } from '../expression/expression-builder.js';
 import { UpdateKeys, UpdateType } from '../util/column-type.js';
 import { ValueExpression } from './value-parser.js';
 export declare type UpdateObject<DB, TB extends keyof DB, UT extends keyof DB = TB> = {
     [C in UpdateKeys<DB[UT]>]?: ValueExpression<DB, TB, UpdateType<DB[UT][C]>> | undefined;
 };
-export declare function parseUpdateObject(update: UpdateObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
+export declare type UpdateObjectFactory<DB, TB extends keyof DB, UT extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => UpdateObject<DB, TB, UT>;
+export declare type UpdateExpression<DB, TB extends keyof DB, UT extends keyof DB = TB> = UpdateObject<DB, TB, UT> | UpdateObjectFactory<DB, TB, UT>;
+export declare function parseUpdateExpression(update: UpdateExpression<any, any, any>): ReadonlyArray<ColumnUpdateNode>;

package/dist/cjs/parser/update-set-parser.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUpdateObject = void 0;
+exports.parseUpdateExpression = void 0;
 const column_node_js_1 = require("../operation-node/column-node.js");
 const column_update_node_js_1 = require("../operation-node/column-update-node.js");
+const expression_builder_js_1 = require("../expression/expression-builder.js");
+const object_utils_js_1 = require("../util/object-utils.js");
 const value_parser_js_1 = require("./value-parser.js");
-function parseUpdateObject(update) {
-    return Object.entries(update)
+function parseUpdateExpression(update) {
+    const updateObj = (0, object_utils_js_1.isFunction)(update)
+        ? update((0, expression_builder_js_1.expressionBuilder)())
+        : update;
+    return Object.entries(updateObj)
         .filter(([_, value]) => value !== undefined)
         .map(([key, value]) => {
         return column_update_node_js_1.ColumnUpdateNode.create(column_node_js_1.ColumnNode.create(key), (0, value_parser_js_1.parseValueExpression)(value));
     });
 }
-exports.parseUpdateObject = parseUpdateObject;
+exports.parseUpdateExpression = parseUpdateExpression;

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

@@ -1,6 +1,11 @@
 import { ExpressionOrFactory } from './expression-parser.js';
 import { OperationNode } from '../operation-node/operation-node.js';
+import { Expression } from '../expression/expression.js';
+import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 export declare type ValueExpression<DB, TB extends keyof DB, V> = V | ExpressionOrFactory<DB, TB, V>;
 export declare type ValueExpressionOrList<DB, TB extends keyof DB, V> = ValueExpression<DB, TB, V> | ReadonlyArray<ValueExpression<DB, TB, V>>;
+export declare type ExtractTypeFromValueExpressionOrList<VE> = VE extends ReadonlyArray<infer AV> ? ExtractTypeFromValueExpression<AV> : ExtractTypeFromValueExpression<VE>;
+declare type ExtractTypeFromValueExpression<VE> = VE extends SelectQueryBuilder<any, any, Record<string, infer SV>> ? SV : VE extends Expression<infer V> ? V : VE;
 export declare function parseValueExpressionOrList(arg: ValueExpressionOrList<any, any, unknown>): OperationNode;
 export declare function parseValueExpression(exp: ValueExpression<any, any, unknown>): OperationNode;
+export {};

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

@@ -10,9 +10,7 @@ function parseValueExpressionOrList(arg) {
     if ((0, object_utils_js_1.isReadonlyArray)(arg)) {
         return parseValueExpressionList(arg);
     }
-    else {
-        return parseValueExpression(arg);
-    }
+    return parseValueExpression(arg);
 }
 exports.parseValueExpressionOrList = parseValueExpressionOrList;
 function parseValueExpression(exp) {

package/dist/cjs/plugin/camel-case/camel-case-plugin.d.ts

@@ -26,6 +26,12 @@ export interface CamelCasePluginOptions {
      * Defaults to false.
      */
     underscoreBetweenUppercaseLetters?: boolean;
+    /**
+     * If true, nested object's keys will not be converted to camel case.
+     *
+     * Defaults to false.
+     */
+    maintainNestedObjectKeys?: boolean;
 }
 /**
  * A plugin that converts snake_case identifiers in the database into
@@ -93,6 +99,7 @@ export interface CamelCasePluginOptions {
  */
 export declare class CamelCasePlugin implements KyselyPlugin {
     #private;
+    readonly opt: CamelCasePluginOptions;
     constructor(opt?: CamelCasePluginOptions);
     /**
      * This is called for each query before it is executed. You can modify the query by

package/dist/cjs/plugin/camel-case/camel-case-plugin.js

@@ -69,10 +69,12 @@ const camel_case_js_1 = require("./camel-case.js");
  * ```
  */
 class CamelCasePlugin {
+    opt;
     #camelCase;
     #snakeCase;
     #snakeCaseTransformer;
     constructor(opt = {}) {
+        this.opt = opt;
         this.#camelCase = (0, camel_case_js_1.createCamelCaseMapper)(opt);
         this.#snakeCase = (0, camel_case_js_1.createSnakeCaseMapper)(opt);
         this.#snakeCaseTransformer = new camel_case_transformer_js_1.SnakeCaseTransformer(this.snakeCase.bind(this));
@@ -93,9 +95,9 @@ class CamelCasePlugin {
         return Object.keys(row).reduce((obj, key) => {
             let value = row[key];
             if (Array.isArray(value)) {
-                value = value.map((it) => (canMap(it) ? this.mapRow(it) : it));
+                value = value.map((it) => (canMap(it, this.opt) ? this.mapRow(it) : it));
             }
-            else if (canMap(value)) {
+            else if (canMap(value, this.opt)) {
                 value = this.mapRow(value);
             }
             obj[this.camelCase(key)] = value;
@@ -110,6 +112,10 @@ class CamelCasePlugin {
     }
 }
 exports.CamelCasePlugin = CamelCasePlugin;
-function canMap(obj) {
-    return ((0, object_utils_js_1.isObject)(obj) && !(0, object_utils_js_1.isDate)(obj) && !(0, object_utils_js_1.isBuffer)(obj) && !(0, object_utils_js_1.isArrayBufferOrView)(obj));
+function canMap(obj, opt) {
+    return ((0, object_utils_js_1.isObject)(obj) &&
+        !(0, object_utils_js_1.isDate)(obj) &&
+        !(0, object_utils_js_1.isBuffer)(obj) &&
+        !(0, object_utils_js_1.isArrayBufferOrView)(obj) &&
+        !opt?.maintainNestedObjectKeys);
 }

package/dist/cjs/plugin/deduplicate-joins/deduplicate-joins-plugin.d.ts

@@ -5,7 +5,7 @@ import { KyselyPlugin, PluginTransformQueryArgs, PluginTransformResultArgs } fro
 /**
  * Plugin that removes duplicate joins from queries.
  *
- * See [this recipe](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
+ * See [this recipe](https://github.com/koskimas/kysely/tree/master/site/docs/recipes/deduplicate-joins.md)
  */
 export declare class DeduplicateJoinsPlugin implements KyselyPlugin {
     #private;

package/dist/cjs/plugin/deduplicate-joins/deduplicate-joins-plugin.js

@@ -5,7 +5,7 @@ const deduplicate_joins_transformer_js_1 = require("./deduplicate-joins-transfor
 /**
  * Plugin that removes duplicate joins from queries.
  *
- * See [this recipe](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
+ * See [this recipe](https://github.com/koskimas/kysely/tree/master/site/docs/recipes/deduplicate-joins.md)
  */
 class DeduplicateJoinsPlugin {
     #transformer = new deduplicate_joins_transformer_js_1.DeduplicateJoinsTransformer();

package/dist/cjs/query-builder/aggregate-function-builder.d.ts

@@ -3,8 +3,9 @@ import { AliasNode } from '../operation-node/alias-node.js';
 import { OverBuilder } from './over-builder.js';
 import { AliasedExpression, Expression } from '../expression/expression.js';
 import { ReferenceExpression } from '../parser/reference-parser.js';
-import { ComparisonOperatorExpression, OperandValueExpressionOrList, WhereGrouper } from '../parser/binary-operation-parser.js';
+import { ComparisonOperatorExpression, OperandValueExpressionOrList } from '../parser/binary-operation-parser.js';
 import { ExistsExpression } from '../parser/unary-operation-parser.js';
+import { WhereExpressionFactory } from './where-interface.js';
 export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown> implements Expression<O> {
     #private;
     constructor(props: AggregateFunctionBuilderProps);
@@ -88,22 +89,19 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
      * ```ts
      * const result = await db
      *   .selectFrom('person')
-     *   .select([
-     *     (eb) =>
-     *       eb.fn
-     *         .count<number>('id')
-     *         .filterWhere('gender', '=', 'female')
-     *         .as('female_count'),
-     *     (eb) =>
-     *       eb.fn
-     *         .count<number>('id')
-     *         .filterWhere('gender', '=', 'male')
-     *         .as('male_count'),
-     *     (eb) =>
-     *       eb.fn
-     *         .count<number>('id')
-     *         .filterWhere('gender', '=', 'other')
-     *         .as('other_count'),
+     *   .select((eb) => [
+     *     eb.fn
+     *       .count<number>('id')
+     *       .filterWhere('gender', '=', 'female')
+     *       .as('female_count'),
+     *     eb.fn
+     *       .count<number>('id')
+     *       .filterWhere('gender', '=', 'male')
+     *       .as('male_count'),
+     *     eb.fn
+     *       .count<number>('id')
+     *       .filterWhere('gender', '=', 'other')
+     *       .as('other_count'),
      *   ])
      *   .executeTakeFirstOrThrow()
      * ```
@@ -119,52 +117,14 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
      * ```
      */
     filterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): AggregateFunctionBuilder<DB, TB, O>;
-    filterWhere(grouper: WhereGrouper<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
+    filterWhere(factory: WhereExpressionFactory<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     filterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
     /**
-     * Adds a `filter` clause with a nested `where exists` clause after the function.
-     *
-     * Similar to {@link WhereInterface}'s `whereExists` method.
-     *
-     * ### Examples
-     *
-     * Count pet owners versus general public:
-     *
-     * ```ts
-     * const result = await db
-     *   .selectFrom('person')
-     *   .select([
-     *     (eb) =>
-     *       eb.fn
-     *         .count<number>('person.id')
-     *         .filterWhereExists((qb) =>
-     *           qb
-     *             .selectFrom('pet')
-     *             .select('pet.id')
-     *             .whereRef('pet.owner_id', '=', 'person.id')
-     *         )
-     *         .as('pet_owner_count'),
-     *     (eb) => eb.fn.count<number>('person.id').as('total_count'),
-     *   ])
-     *   .executeTakeFirstOrThrow()
-     * ```
-     *
-     * The generated SQL (PostgreSQL):
-     *
-     * ```sql
-     * select count("person"."id") filter(where exists (
-     *   select "pet"."id"
-     *   from "pet"
-     *   where "pet"."owner_id" = "person"."id"
-     * )) as "pet_ower_count",
-     *   count("person"."id") as "total_count"
-     * from "person"
-     * ```
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
      */
     filterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     /**
-     * Just like {@link filterWhereExists} but creates a `not exists` clause inside
-     * the `filter` clause.
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
      */
     filterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     /**
@@ -180,13 +140,12 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
      * ```ts
      * const result = await db
      *   .selectFrom('person')
-     *   .select([
-     *     (eb) =>
-     *       eb.fn
-     *         .count<number>('id')
-     *         .filterWhereRef('first_name', '=', 'last_name')
-     *         .as('repeat_name_count'),
-     *     (eb) => eb.fn.count<number>('id').as('total_count'),
+     *   .select((eb) => [
+     *     eb.fn
+     *       .count<number>('id')
+     *       .filterWhereRef('first_name', '=', 'last_name')
+     *       .as('repeat_name_count'),
+     *     eb.fn.count<number>('id').as('total_count'),
      *   ])
      *   .executeTakeFirstOrThrow()
      * ```
@@ -202,64 +161,27 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
      */
     filterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     /**
-     * Adds a `filter` clause with a nested `or where` clause after the function.
-     * Otherwise works just like {@link filterWhere}.
-     *
-     * Similar to {@link WhereInterface}'s `orWhere` method.
-     *
-     * ### Examples
-     *
-     * For some reason you're tasked with counting adults (18+) or people called
-     * "Bob" versus general public:
-     *
-     * ```ts
-     * const result = await db
-     *   .selectFrom('person')
-     *   .select([
-     *     (eb) =>
-     *       eb.fn
-     *         .count<number>('id')
-     *         .filterWhere('age', '>=', '18')
-     *         .orFilterWhere('first_name', '=', 'Bob')
-     *         .as('adult_or_bob_count'),
-     *     (eb) => eb.fn.count<number>('id').as('total_count'),
-     *   ])
-     *   .executeTakeFirstOrThrow()
-     * ```
-     *
-     * The generated SQL (PostgreSQL):
-     *
-     * ```sql
-     * select
-     *   count("id") filter(where "age" >= $1 or "first_name" = $2) as "adult_or_bob_count",
-     *   count("id") as "total_count"
-     * from "person"
-     * ```
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
      */
     orFilterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): AggregateFunctionBuilder<DB, TB, O>;
-    orFilterWhere(grouper: WhereGrouper<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
+    /**
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
+     */
+    orFilterWhere(factory: WhereExpressionFactory<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
+    /**
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
+     */
     orFilterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
     /**
-     * Just like {@link filterWhereExists} but creates an `or exists` clause inside
-     * the `filter` clause.
-     *
-     * Similar to {@link WhereInterface}'s `orWhereExists` method.
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
      */
     orFilterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     /**
-     * Just like {@link filterWhereExists} but creates an `or not exists` clause inside
-     * the `filter` clause.
-     *
-     * Similar to {@link WhereInterface}'s `orWhereNotExists` method.
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
      */
     orFilterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     /**
-     * Adds an `or where` clause inside the `filter` clause. Otherwise works just
-     * like {@link filterWhereRef}.
-     *
-     * Also see {@link orFilterWhere} and {@link filterWhere}.
-     *
-     * Similar to {@link WhereInterface}'s `orWhereRef` method.
+     * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
      */
     orFilterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
     /**
@@ -305,6 +227,11 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
      * ```
      */
     over(over?: OverBuilderCallback<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
+    /**
+     * Simply calls the provided function passing `this` as the only argument. `$call` returns
+     * what the provided function returns.
+     */
+    $call<T>(func: (qb: this) => T): T;
     /**
      * Creates the OperationNode that describes how to compile this expression into SQL.
      *