kysely 0.15.0 → 0.16.0

package/dist/esm/index.d.ts

@@ -1,155 +1,8 @@
-export * from './kysely.js';
-export * from './query-creator.js';
-export * from './query-builder/where-interface.js';
-export * from './query-builder/join-interface.js';
-export * from './query-builder/returning-interface.js';
-export * from './query-builder/having-interface.js';
-export * from './query-builder/select-query-builder.js';
-export * from './query-builder/insert-query-builder.js';
-export * from './query-builder/update-query-builder.js';
-export * from './query-builder/delete-query-builder.js';
-export * from './query-builder/no-result-error.js';
-export * from './query-builder/join-builder.js';
-export * from './query-builder/expression-builder.js';
-export * from './query-builder/function-builder.js';
-export * from './query-builder/insert-result.js';
-export * from './query-builder/delete-result.js';
-export * from './query-builder/update-result.js';
-export * from './query-builder/on-conflict-builder.js';
-export * from './raw-builder/raw-builder.js';
-export * from './query-executor/query-executor.js';
-export * from './query-executor/default-query-executor.js';
-export * from './query-executor/noop-query-executor.js';
-export * from './query-compiler/default-query-compiler.js';
-export * from './query-compiler/compiled-query.js';
-export * from './schema/schema.js';
-export * from './schema/create-table-builder.js';
-export * from './schema/drop-table-builder.js';
-export * from './schema/create-index-builder.js';
-export * from './schema/drop-index-builder.js';
-export * from './schema/create-schema-builder.js';
-export * from './schema/drop-schema-builder.js';
-export * from './schema/column-definition-builder.js';
-export * from './schema/foreign-key-constraint-builder.js';
-export * from './schema/alter-table-builder.js';
-export * from './schema/create-view-builder.js';
-export * from './schema/drop-view-builder.js';
-export * from './dynamic/dynamic.js';
-export * from './driver/driver.js';
-export * from './driver/database-connection.js';
-export * from './driver/connection-provider.js';
-export * from './driver/default-connection-provider.js';
-export * from './driver/single-connection-provider.js';
-export * from './dialect/postgres/postgres-dialect.js';
-export * from './dialect/postgres/postgres-query-compiler.js';
-export * from './dialect/postgres/postgres-driver.js';
-export * from './dialect/postgres/postgres-introspector.js';
-export * from './dialect/postgres/postgres-adapter.js';
-export * from './dialect/mysql/mysql-dialect.js';
-export * from './dialect/mysql/mysql-query-compiler.js';
-export * from './dialect/mysql/mysql-driver.js';
-export * from './dialect/mysql/mysql-introspector.js';
-export * from './dialect/mysql/mysql-adapter.js';
+export * from './index-nodeless.js';
+export * from './migration/file-migration-provider.js';
 export * from './dialect/sqlite/sqlite-dialect.js';
-export * from './dialect/sqlite/sqlite-query-compiler.js';
 export * from './dialect/sqlite/sqlite-driver.js';
-export * from './dialect/sqlite/sqlite-introspector.js';
-export * from './dialect/sqlite/sqlite-adapter.js';
-export * from './query-compiler/default-query-compiler.js';
-export * from './query-compiler/query-compiler.js';
-export * from './migration/migrator.js';
-export * from './migration/file-migration-provider.js';
-export * from './dialect/dialect.js';
-export * from './dialect/dialect-adapter.js';
-export * from './dialect/dialect-adapter-base.js';
-export * from './plugin/kysely-plugin.js';
-export * from './plugin/camel-case/camel-case-plugin.js';
-export * from './operation-node/add-column-node.js';
-export * from './operation-node/add-constraint-node.js';
-export * from './operation-node/alias-node.js';
-export * from './operation-node/alter-column-node.js';
-export * from './operation-node/alter-table-node.js';
-export * from './operation-node/and-node.js';
-export * from './operation-node/check-constraint-node.js';
-export * from './operation-node/column-definition-node.js';
-export * from './operation-node/column-node.js';
-export * from './operation-node/column-update-node.js';
-export * from './operation-node/common-table-expression-node.js';
-export * from './operation-node/common-table-expression-name-node.js';
-export * from './operation-node/constraint-node.js';
-export * from './operation-node/create-index-node.js';
-export * from './operation-node/create-schema-node.js';
-export * from './operation-node/create-table-node.js';
-export * from './operation-node/create-view-node.js';
-export * from './operation-node/data-type-node.js';
-export * from './operation-node/default-value-node.js';
-export * from './operation-node/delete-query-node.js';
-export * from './operation-node/drop-column-node.js';
-export * from './operation-node/drop-constraint-node.js';
-export * from './operation-node/drop-index-node.js';
-export * from './operation-node/drop-schema-node.js';
-export * from './operation-node/drop-table-node.js';
-export * from './operation-node/drop-view-node.js';
-export * from './operation-node/filter-node.js';
-export * from './operation-node/foreign-key-constraint-node.js';
-export * from './operation-node/from-node.js';
-export * from './operation-node/generated-node.js';
-export * from './operation-node/group-by-item-node.js';
-export * from './operation-node/group-by-node.js';
-export * from './operation-node/having-node.js';
-export * from './operation-node/identifier-node.js';
-export * from './operation-node/insert-query-node.js';
-export * from './operation-node/join-node.js';
-export * from './operation-node/limit-node.js';
-export * from './operation-node/list-node.js';
-export * from './operation-node/modify-column-node.js';
-export * from './operation-node/offset-node.js';
-export * from './operation-node/on-conflict-node.js';
-export * from './operation-node/on-duplicate-key-node.js';
-export * from './operation-node/on-node.js';
-export * from './operation-node/operation-node-source.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-utils.js';
-export * from './operation-node/operation-node-visitor.js';
-export * from './operation-node/operation-node.js';
-export * from './operation-node/operator-node.js';
-export * from './operation-node/or-node.js';
-export * from './operation-node/order-by-item-node.js';
-export * from './operation-node/order-by-node.js';
-export * from './operation-node/parens-node.js';
-export * from './operation-node/primary-constraint-node.js';
-export * from './operation-node/primitive-value-list-node.js';
-export * from './operation-node/query-node.js';
-export * from './operation-node/raw-node.js';
-export * from './operation-node/reference-node.js';
-export * from './operation-node/references-node.js';
-export * from './operation-node/rename-column-node.js';
-export * from './operation-node/returning-node.js';
-export * from './operation-node/select-all-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/selection-node.js';
-export * from './operation-node/table-node.js';
-export * from './operation-node/union-node.js';
-export * from './operation-node/unique-constraint-node.js';
-export * from './operation-node/update-query-node.js';
-export * from './operation-node/value-list-node.js';
-export * from './operation-node/value-node.js';
-export * from './operation-node/values-node.js';
-export * from './operation-node/where-node.js';
-export * from './operation-node/with-node.js';
-export * from './dialect/database-introspector.js';
-export * from './util/column-type.js';
-export * from './util/compilable.js';
-export * from './util/log.js';
-export { AnyColumn, UnknownRow, AnySelectQueryBuilder, } from './util/type-utils.js';
-export { SelectExpression, SelectExpressionOrList, Selection, } from './parser/select-parser.js';
-export { ReferenceExpression, ReferenceExpressionOrList, } from './parser/reference-parser.js';
-export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
-export { FilterValueExpression, FilterValueExpressionOrList, ExistsExpression, FilterOperator, } from './parser/filter-parser.js';
-export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
-export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
-export { InsertObject } from './parser/insert-values-parser.js';
-export { MutationObject } from './parser/update-set-parser.js';
-export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
-export { UnionExpression } from './parser/union-parser.js';
+export * from './dialect/mysql/mysql-dialect.js';
+export * from './dialect/mysql/mysql-driver.js';
+export * from './dialect/postgres/postgres-driver.js';
+export * from './dialect/postgres/postgres-dialect.js';

package/dist/esm/index.js

@@ -1,144 +1,8 @@
-export * from './kysely.js';
-export * from './query-creator.js';
-export * from './query-builder/where-interface.js';
-export * from './query-builder/join-interface.js';
-export * from './query-builder/returning-interface.js';
-export * from './query-builder/having-interface.js';
-export * from './query-builder/select-query-builder.js';
-export * from './query-builder/insert-query-builder.js';
-export * from './query-builder/update-query-builder.js';
-export * from './query-builder/delete-query-builder.js';
-export * from './query-builder/no-result-error.js';
-export * from './query-builder/join-builder.js';
-export * from './query-builder/expression-builder.js';
-export * from './query-builder/function-builder.js';
-export * from './query-builder/insert-result.js';
-export * from './query-builder/delete-result.js';
-export * from './query-builder/update-result.js';
-export * from './query-builder/on-conflict-builder.js';
-export * from './raw-builder/raw-builder.js';
-export * from './query-executor/query-executor.js';
-export * from './query-executor/default-query-executor.js';
-export * from './query-executor/noop-query-executor.js';
-export * from './query-compiler/default-query-compiler.js';
-export * from './query-compiler/compiled-query.js';
-export * from './schema/schema.js';
-export * from './schema/create-table-builder.js';
-export * from './schema/drop-table-builder.js';
-export * from './schema/create-index-builder.js';
-export * from './schema/drop-index-builder.js';
-export * from './schema/create-schema-builder.js';
-export * from './schema/drop-schema-builder.js';
-export * from './schema/column-definition-builder.js';
-export * from './schema/foreign-key-constraint-builder.js';
-export * from './schema/alter-table-builder.js';
-export * from './schema/create-view-builder.js';
-export * from './schema/drop-view-builder.js';
-export * from './dynamic/dynamic.js';
-export * from './driver/driver.js';
-export * from './driver/database-connection.js';
-export * from './driver/connection-provider.js';
-export * from './driver/default-connection-provider.js';
-export * from './driver/single-connection-provider.js';
-export * from './dialect/postgres/postgres-dialect.js';
-export * from './dialect/postgres/postgres-query-compiler.js';
-export * from './dialect/postgres/postgres-driver.js';
-export * from './dialect/postgres/postgres-introspector.js';
-export * from './dialect/postgres/postgres-adapter.js';
-export * from './dialect/mysql/mysql-dialect.js';
-export * from './dialect/mysql/mysql-query-compiler.js';
-export * from './dialect/mysql/mysql-driver.js';
-export * from './dialect/mysql/mysql-introspector.js';
-export * from './dialect/mysql/mysql-adapter.js';
+export * from './index-nodeless.js';
+export * from './migration/file-migration-provider.js';
 export * from './dialect/sqlite/sqlite-dialect.js';
-export * from './dialect/sqlite/sqlite-query-compiler.js';
 export * from './dialect/sqlite/sqlite-driver.js';
-export * from './dialect/sqlite/sqlite-introspector.js';
-export * from './dialect/sqlite/sqlite-adapter.js';
-export * from './query-compiler/default-query-compiler.js';
-export * from './query-compiler/query-compiler.js';
-export * from './migration/migrator.js';
-export * from './migration/file-migration-provider.js';
-export * from './dialect/dialect.js';
-export * from './dialect/dialect-adapter.js';
-export * from './dialect/dialect-adapter-base.js';
-export * from './plugin/kysely-plugin.js';
-export * from './plugin/camel-case/camel-case-plugin.js';
-export * from './operation-node/add-column-node.js';
-export * from './operation-node/add-constraint-node.js';
-export * from './operation-node/alias-node.js';
-export * from './operation-node/alter-column-node.js';
-export * from './operation-node/alter-table-node.js';
-export * from './operation-node/and-node.js';
-export * from './operation-node/check-constraint-node.js';
-export * from './operation-node/column-definition-node.js';
-export * from './operation-node/column-node.js';
-export * from './operation-node/column-update-node.js';
-export * from './operation-node/common-table-expression-node.js';
-export * from './operation-node/common-table-expression-name-node.js';
-export * from './operation-node/constraint-node.js';
-export * from './operation-node/create-index-node.js';
-export * from './operation-node/create-schema-node.js';
-export * from './operation-node/create-table-node.js';
-export * from './operation-node/create-view-node.js';
-export * from './operation-node/data-type-node.js';
-export * from './operation-node/default-value-node.js';
-export * from './operation-node/delete-query-node.js';
-export * from './operation-node/drop-column-node.js';
-export * from './operation-node/drop-constraint-node.js';
-export * from './operation-node/drop-index-node.js';
-export * from './operation-node/drop-schema-node.js';
-export * from './operation-node/drop-table-node.js';
-export * from './operation-node/drop-view-node.js';
-export * from './operation-node/filter-node.js';
-export * from './operation-node/foreign-key-constraint-node.js';
-export * from './operation-node/from-node.js';
-export * from './operation-node/generated-node.js';
-export * from './operation-node/group-by-item-node.js';
-export * from './operation-node/group-by-node.js';
-export * from './operation-node/having-node.js';
-export * from './operation-node/identifier-node.js';
-export * from './operation-node/insert-query-node.js';
-export * from './operation-node/join-node.js';
-export * from './operation-node/limit-node.js';
-export * from './operation-node/list-node.js';
-export * from './operation-node/modify-column-node.js';
-export * from './operation-node/offset-node.js';
-export * from './operation-node/on-conflict-node.js';
-export * from './operation-node/on-duplicate-key-node.js';
-export * from './operation-node/on-node.js';
-export * from './operation-node/operation-node-source.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-utils.js';
-export * from './operation-node/operation-node-visitor.js';
-export * from './operation-node/operation-node.js';
-export * from './operation-node/operator-node.js';
-export * from './operation-node/or-node.js';
-export * from './operation-node/order-by-item-node.js';
-export * from './operation-node/order-by-node.js';
-export * from './operation-node/parens-node.js';
-export * from './operation-node/primary-constraint-node.js';
-export * from './operation-node/primitive-value-list-node.js';
-export * from './operation-node/query-node.js';
-export * from './operation-node/raw-node.js';
-export * from './operation-node/reference-node.js';
-export * from './operation-node/references-node.js';
-export * from './operation-node/rename-column-node.js';
-export * from './operation-node/returning-node.js';
-export * from './operation-node/select-all-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/selection-node.js';
-export * from './operation-node/table-node.js';
-export * from './operation-node/union-node.js';
-export * from './operation-node/unique-constraint-node.js';
-export * from './operation-node/update-query-node.js';
-export * from './operation-node/value-list-node.js';
-export * from './operation-node/value-node.js';
-export * from './operation-node/values-node.js';
-export * from './operation-node/where-node.js';
-export * from './operation-node/with-node.js';
-export * from './dialect/database-introspector.js';
-export * from './util/column-type.js';
-export * from './util/compilable.js';
-export * from './util/log.js';
+export * from './dialect/mysql/mysql-dialect.js';
+export * from './dialect/mysql/mysql-driver.js';
+export * from './dialect/postgres/postgres-driver.js';
+export * from './dialect/postgres/postgres-dialect.js';

package/dist/esm/kysely.js

@@ -56,9 +56,11 @@ import { PRIVATE_ADAPTER } from './util/private-symbols.js';
 export class Kysely extends QueryCreator {
     #props;
     constructor(args) {
+        let superProps;
+        let props;
         if (isKyselyProps(args)) {
-            super({ executor: args.executor, parseContext: args.parseContext });
-            this.#props = freeze({ ...args });
+            superProps = { executor: args.executor, parseContext: args.parseContext };
+            props = { ...args };
         }
         else {
             const dialect = args.dialect;
@@ -70,15 +72,17 @@ export class Kysely extends QueryCreator {
             const runtimeDriver = new RuntimeDriver(driver, log);
             const connectionProvider = new DefaultConnectionProvider(runtimeDriver);
             const executor = new DefaultQueryExecutor(compiler, connectionProvider, args.plugins ?? []);
-            super({ executor, parseContext });
-            this.#props = freeze({
+            superProps = { executor, parseContext };
+            props = {
                 config: args,
                 executor,
                 dialect,
                 driver: runtimeDriver,
                 parseContext,
-            });
+            };
         }
+        super(superProps);
+        this.#props = freeze(props);
     }
     /**
      * Returns the {@link SchemaModule} module for building database schema.

package/dist/esm/migration/file-migration-provider.d.ts

@@ -1,41 +1,18 @@
 import { Migration, MigrationProvider } from './migrator.js';
-/**
- * A function that takes a folder path and returns names of the
- * files insider that folder.
- */
-export declare type ReadDir = (migrationFolderPath: string) => Promise<string[]>;
-/**
- * A function that combines two file path parts into a single file path.
- *
- * ```ts
- * joinPath('/some/path', 'file.ts')
- * // ==> '/some/path/file.ts'
- * ```
- */
-export declare type JoinPath = (part1: string, part2: string) => string;
 /**
  * Reads all migrations from a folder.
  *
- * You need to provide a function for reading files in a folder and a function for
- * joining file paths together. The API is like this to make Kysely independent of
- * node.js or any other environment. See the example usage on node.js below.
- *
  * ### Examples
  *
  * ```ts
- * import * as path from 'path'
- * import * as fs from 'fs/promises'
- *
  * new FileMigrationProvider(
- *   fs.readdir,
- *   path.join,
- *   path.join(__dirname, 'migrations')
+ *   'path/to/migrations/folder'
  * )
  * ```
  */
 export declare class FileMigrationProvider implements MigrationProvider {
     #private;
-    constructor(readDir: ReadDir, joinPath: JoinPath, migrationFolderPath: string);
+    constructor(migrationFolderPath: string);
     /**
      * Returns all migrations, old and new.
      *

package/dist/esm/migration/file-migration-provider.js

@@ -2,39 +2,30 @@ import { isFunction, isObject } from '../util/object-utils.js';
 /**
  * Reads all migrations from a folder.
  *
- * You need to provide a function for reading files in a folder and a function for
- * joining file paths together. The API is like this to make Kysely independent of
- * node.js or any other environment. See the example usage on node.js below.
- *
  * ### Examples
  *
  * ```ts
- * import * as path from 'path'
- * import * as fs from 'fs/promises'
- *
  * new FileMigrationProvider(
- *   fs.readdir,
- *   path.join,
- *   path.join(__dirname, 'migrations')
+ *   'path/to/migrations/folder'
  * )
  * ```
  */
 export class FileMigrationProvider {
-    #readDir;
-    #joinPath;
     #migrationFolderPath;
-    constructor(readDir, joinPath, migrationFolderPath) {
-        this.#readDir = readDir;
-        this.#joinPath = joinPath;
+    constructor(migrationFolderPath) {
         this.#migrationFolderPath = migrationFolderPath;
     }
     async getMigrations() {
+        // Import these dynamically so that we don't have any top level
+        // node dependencies.
+        const fs = await import('fs/promises');
+        const path = await import('path');
         const migrations = {};
-        const files = await this.#readDir(this.#migrationFolderPath);
+        const files = await fs.readdir(this.#migrationFolderPath);
         for (const fileName of files) {
             if ((fileName.endsWith('.js') || fileName.endsWith('.ts')) &&
                 !fileName.endsWith('.d.ts')) {
-                const migration = await import(this.#joinPath(this.#migrationFolderPath, fileName));
+                const migration = await import(path.join(this.#migrationFolderPath, fileName));
                 if (isMigration(migration)) {
                     migrations[fileName.substring(0, fileName.length - 3)] = migration;
                 }

package/dist/esm/migration/migrator.d.ts

@@ -26,14 +26,9 @@ export interface Migration {
  * ```ts
  * const migrator = new Migrator({
  *   db,
- *   // The constructor signature of FileMigrationProvider is a
- *   // bit weird to keep Kysely independent of node.js or any
- *   // other environment.
  *   provider: new FileMigrationProvider(
- *     fs.readdir,
- *     path.join,
  *     // Path to the folder that contains all your migrations.
- *     'migrations'
+ *     'some/path/to/migrations'
  *   )
  * })
  * ```
@@ -57,9 +52,6 @@ export declare class Migrator {
      * ### Examples
      *
      * ```ts
-     * import * as path from 'path'
-     * import * as fs from 'fs/promises'
-     *
      * const db = new Kysely<Database>({
      *   dialect: new PostgresDialect({
      *     host: 'localhost',
@@ -69,14 +61,9 @@ export declare class Migrator {
      *
      * const migrator = new Migrator({
      *   db,
-     *   // The constructor signature of FileMigrationProvider is a
-     *   // bit weird to keep Kysely independent of node.js or any
-     *   // other environment.
      *   provider: new FileMigrationProvider(
-     *     fs.readdir,
-     *     path.join,
      *     // Path to the folder that contains all your migrations.
-     *     'migrations'
+     *     'some/path/to/migrations'
      *   )
      * })
      *

package/dist/esm/migration/migrator.js

@@ -17,14 +17,9 @@ export const NO_MIGRATIONS = freeze({ __noMigrations__: true });
  * ```ts
  * const migrator = new Migrator({
  *   db,
- *   // The constructor signature of FileMigrationProvider is a
- *   // bit weird to keep Kysely independent of node.js or any
- *   // other environment.
  *   provider: new FileMigrationProvider(
- *     fs.readdir,
- *     path.join,
  *     // Path to the folder that contains all your migrations.
- *     'migrations'
+ *     'some/path/to/migrations'
  *   )
  * })
  * ```
@@ -50,9 +45,6 @@ export class Migrator {
      * ### Examples
      *
      * ```ts
-     * import * as path from 'path'
-     * import * as fs from 'fs/promises'
-     *
      * const db = new Kysely<Database>({
      *   dialect: new PostgresDialect({
      *     host: 'localhost',
@@ -62,14 +54,9 @@ export class Migrator {
      *
      * const migrator = new Migrator({
      *   db,
-     *   // The constructor signature of FileMigrationProvider is a
-     *   // bit weird to keep Kysely independent of node.js or any
-     *   // other environment.
      *   provider: new FileMigrationProvider(
-     *     fs.readdir,
-     *     path.join,
      *     // Path to the folder that contains all your migrations.
-     *     'migrations'
+     *     'some/path/to/migrations'
      *   )
      * })
      *

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

@@ -1,11 +1,11 @@
 import { JoinNode, JoinType } from '../operation-node/join-node.js';
 import { AnyColumn, AnyColumnWithTable } from '../util/type-utils.js';
-import { ExtractAliasFromTableExpression, TableExpressionDatabase } from './table-parser.js';
+import { TableExpressionDatabase, TableExpressionTables } from './table-parser.js';
 import { JoinBuilder } from '../query-builder/join-builder.js';
 import { ParseContext } from './parse-context.js';
 export declare type JoinReferenceExpression<DB, TB extends keyof DB, TE> = AnyJoinColumn<DB, TB, TE> | AnyJoinColumnWithTable<DB, TB, TE>;
-export declare type JoinCallbackExpression<DB, TB extends keyof DB, TE> = (join: JoinBuilder<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>) => JoinBuilder<any, any>;
-declare type AnyJoinColumn<DB, TB extends keyof DB, TE> = AnyColumn<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>;
-declare type AnyJoinColumnWithTable<DB, TB extends keyof DB, TE> = AnyColumnWithTable<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>;
+export declare type JoinCallbackExpression<DB, TB extends keyof DB, TE> = (join: JoinBuilder<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>>) => JoinBuilder<any, any>;
+declare type AnyJoinColumn<DB, TB extends keyof DB, TE> = AnyColumn<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>>;
+declare type AnyJoinColumnWithTable<DB, TB extends keyof DB, TE> = AnyColumnWithTable<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>>;
 export declare function parseJoin(ctx: ParseContext, joinType: JoinType, args: any[]): JoinNode;
 export {};

package/dist/esm/query-builder/delete-query-builder.d.ts

@@ -17,6 +17,7 @@ import { JoinInterface } from './join-interface.js';
 import { ReturningInterface } from './returning-interface.js';
 import { NoResultErrorConstructor } from './no-result-error.js';
 import { DeleteQueryNode } from '../operation-node/delete-query-node.js';
+import { Selectable } from '../util/column-type.js';
 export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, JoinInterface<DB, TB>, ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
     #private;
     constructor(props: DeleteQueryBuilderProps);
@@ -472,13 +473,13 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * and "pet"."name" = $1
      * ```
      *
-     * You can join a subquery by providing a function as the first
-     * argument:
+     * You can join a subquery by providing a select query (or a callback)
+     * as the first argument:
      *
      * ```ts
      * await db.selectFrom('person')
      *   .innerJoin(
-     *     (qb) => qb.selectFrom('pet')
+     *     qb.selectFrom('pet')
      *       .select(['owner_id', 'name'])
      *       .where('name', '=', 'Doggo')
      *       .as('doggos'),
@@ -584,7 +585,7 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * Adds a `returning *` to an insert/update/delete query on databases
      * that support `returning` such as PostgreSQL.
      */
-    returningAll(): DeleteQueryBuilder<DB, TB, DB[TB]>;
+    returningAll(): DeleteQueryBuilder<DB, TB, Selectable<DB[TB]>>;
     /**
      * Simply calls the given function passing `this` as the only argument.
      *

package/dist/esm/query-builder/insert-query-builder.d.ts

@@ -15,6 +15,7 @@ import { NoResultErrorConstructor } from './no-result-error.js';
 import { ComplexExpression } from '../parser/complex-expression-parser.js';
 import { ReturningInterface } from './returning-interface.js';
 import { OnConflictBuilder, OnConflictDoNothingBuilder, OnConflictUpdateBuilder } from './on-conflict-builder.js';
+import { Selectable } from '../util/column-type.js';
 export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
     #private;
     constructor(props: InsertQueryBuilderProps);
@@ -427,7 +428,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
      * Adds a `returning *` to an insert/update/delete query on databases
      * that support `returning` such as PostgreSQL.
      */
-    returningAll(): InsertQueryBuilder<DB, TB, DB[TB]>;
+    returningAll(): InsertQueryBuilder<DB, TB, Selectable<DB[TB]>>;
     /**
      * Simply calls the given function passing `this` as the only argument.
      *

package/dist/esm/query-builder/join-interface.d.ts

@@ -80,13 +80,13 @@ export interface JoinInterface<DB, TB extends keyof DB> {
      * and "pet"."name" = $1
      * ```
      *
-     * You can join a subquery by providing a function as the first
-     * argument:
+     * You can join a subquery by providing a select query (or a callback)
+     * as the first argument:
      *
      * ```ts
      * await db.selectFrom('person')
      *   .innerJoin(
-     *     (qb) => qb.selectFrom('pet')
+     *     qb.selectFrom('pet')
      *       .select(['owner_id', 'name'])
      *       .where('name', '=', 'Doggo')
      *       .as('doggos'),

package/dist/esm/query-builder/returning-interface.d.ts

@@ -1,5 +1,6 @@
 import { ReturningRow } from '../parser/returning-parser.js';
 import { SelectExpression } from '../parser/select-parser.js';
+import { Selectable } from '../util/column-type.js';
 export interface ReturningInterface<DB, TB extends keyof DB, O> {
     /**
      * Allows you to return data from modified rows.
@@ -66,5 +67,5 @@ export interface ReturningInterface<DB, TB extends keyof DB, O> {
      * Adds a `returning *` to an insert/update/delete query on databases
      * that support `returning` such as PostgreSQL.
      */
-    returningAll(): ReturningInterface<DB, TB, DB[TB]>;
+    returningAll(): ReturningInterface<DB, TB, Selectable<DB[TB]>>;
 }