kysely 0.12.1 → 0.14.1

package/dist/esm/index.js

@@ -15,6 +15,7 @@ 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';
@@ -73,6 +74,7 @@ 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';
@@ -90,7 +92,7 @@ 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-always-as-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';
@@ -135,6 +137,6 @@ 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 './introspection/database-introspector.js';
+export * from './dialect/database-introspector.js';
 export * from './util/compilable.js';
 export * from './util/log.js';

package/dist/esm/kysely.d.ts

@@ -6,7 +6,7 @@ import { QueryExecutor } from './query-executor/query-executor.js';
 import { QueryCreator } from './query-creator.js';
 import { KyselyPlugin } from './plugin/kysely-plugin.js';
 import { GeneratedPlaceholder } from './util/type-utils.js';
-import { DatabaseIntrospector } from './introspection/database-introspector.js';
+import { DatabaseIntrospector } from './dialect/database-introspector.js';
 import { Driver, IsolationLevel } from './driver/driver.js';
 import { ParseContext } from './parser/parse-context.js';
 import { FunctionBuilder } from './query-builder/function-builder.js';
@@ -207,6 +207,38 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * Returns a copy of this Kysely instance without any plugins.
      */
     withoutPlugins(): Kysely<DB>;
+    /**
+     * Returns a copy of this Kysely instance with tables added to its
+     * database type.
+     *
+     * This method only modifies the types and doesn't affect any of the
+     * executed queries in any way.
+     *
+     * ### Examples
+     *
+     * The following example adds and uses a temporary table:
+     *
+     * @example
+     * ```ts
+     * await db.schema
+     *   .createTable('temp_table')
+     *   .temporary()
+     *   .addColumn('some_column', 'integer')
+     *   .execute()
+     *
+     * const tempDb = db.withTables<{
+     *   temp_table: {
+     *     some_column: number
+     *   }
+     * }>()
+     *
+     * await tempDb
+     *   .insertInto('temp_table')
+     *   .values({ some_column: 100 })
+     *   .execute()
+     * ```
+     */
+    withTables<T extends Record<string, Record<string, any>>>(): Kysely<DB & T>;
     /**
      * Releases all resources and disconnects from the database.
      *
@@ -223,13 +255,132 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
 export declare class Transaction<DB> extends Kysely<DB> {
     #private;
     constructor(props: KyselyProps);
+    /**
+     * Returns true if this `Kysely` instance is a transaction.
+     *
+     * You can also use `db instanceof Transaction`.
+     */
     get isTransaction(): true;
+    /**
+     * Returns the {@link MigrationModule} module for managing and running migrations.
+     */
     get migration(): MigrationModule;
+    /**
+     * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.
+     *
+     * The returned {@link TransactionBuilder} can be used to configure the transaction. The
+     * {@link TransactionBuilder.execute} method can then be called to run the transaction.
+     * {@link TransactionBuilder.execute} takes a function that is run inside the
+     * transaction. If the function throws, the transaction is rolled back. Otherwise
+     * the transaction is committed.
+     *
+     * The callback function passed to the {@link TransactionBuilder.execute | execute}
+     * method gets the transaction object as its only argument. The transaction is
+     * of type {@link Transaction} which inherits {@link Kysely}. Any query
+     * started through the transaction object is executed inside the transaction.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * const catto = await db.transaction().execute(async (trx) => {
+     *   const jennifer = await trx.insertInto('person')
+     *     .values({
+     *       id: db.generated,
+     *       first_name: 'Jennifer',
+     *       last_name: 'Aniston',
+     *     })
+     *     .returning('id')
+     *     .executeTakeFirstOrThrow()
+     *
+     *   await someFunction(trx, jennifer)
+     *
+     *   return await trx.insertInto('pet')
+     *     .values({
+     *       id: db.generated,
+     *       user_id: jennifer.id,
+     *       name: 'Catto',
+     *       species: 'cat'
+     *     })
+     *     .returning('*')
+     *     .executeTakeFirst()
+     * })
+     * ```
+     *
+     * Setting the isolation level:
+     *
+     * ```ts
+     * await db
+     *   .transaction()
+     *   .setIsolationLevel('serializable')
+     *   .execute(async (trx) => {
+     *     await doStuff(trx)
+     *   })
+     * ```
+     */
     transaction(): TransactionBuilder<DB>;
+    /**
+     * Provides a kysely instance bound to a single database connection.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await db
+     *   .connection()
+     *   .execute(async (db) => {
+     *     // `db` is an instance of `Kysely` that's bound to a single
+     *     // database connection. All queries executed through `db` use
+     *     // the same connection.
+     *     await doStuff(db)
+     *   })
+     * ```
+     */
     connection(): ConnectionBuilder<DB>;
+    /**
+     * Releases all resources and disconnects from the database.
+     *
+     * You need to call this when you are done using the `Kysely` instance.
+     */
     destroy(): Promise<void>;
+    /**
+     * Returns a copy of this Kysely instance with the given plugin installed.
+     */
     withPlugin(plugin: KyselyPlugin): Transaction<DB>;
+    /**
+     * Returns a copy of this Kysely instance without any plugins.
+     */
     withoutPlugins(): Transaction<DB>;
+    /**
+     * Returns a copy of this Kysely instance with tables added to its
+     * database type.
+     *
+     * This method only modifies the types and doesn't affect any of the
+     * executed queries in any way.
+     *
+     * ### Examples
+     *
+     * The following example adds and uses a temporary table:
+     *
+     * @example
+     * ```ts
+     * await db.schema
+     *   .createTable('temp_table')
+     *   .temporary()
+     *   .addColumn('some_column', 'integer')
+     *   .execute()
+     *
+     * const tempDb = db.withTables<{
+     *   temp_table: {
+     *     some_column: number
+     *   }
+     * }>()
+     *
+     * await tempDb
+     *   .insertInto('temp_table')
+     *   .values({ some_column: 100 })
+     *   .execute()
+     * ```
+     */
+    withTables<T extends Record<string, Record<string, any>>>(): Transaction<DB & T>;
 }
 export interface KyselyProps {
     readonly config: KyselyConfig;

package/dist/esm/kysely.js

@@ -258,6 +258,40 @@ export class Kysely extends QueryCreator {
             executor: this.#props.executor.withoutPlugins(),
         });
     }
+    /**
+     * Returns a copy of this Kysely instance with tables added to its
+     * database type.
+     *
+     * This method only modifies the types and doesn't affect any of the
+     * executed queries in any way.
+     *
+     * ### Examples
+     *
+     * The following example adds and uses a temporary table:
+     *
+     * @example
+     * ```ts
+     * await db.schema
+     *   .createTable('temp_table')
+     *   .temporary()
+     *   .addColumn('some_column', 'integer')
+     *   .execute()
+     *
+     * const tempDb = db.withTables<{
+     *   temp_table: {
+     *     some_column: number
+     *   }
+     * }>()
+     *
+     * await tempDb
+     *   .insertInto('temp_table')
+     *   .values({ some_column: 100 })
+     *   .execute()
+     * ```
+     */
+    withTables() {
+        return new Kysely({ ...this.#props });
+    }
     /**
      * Releases all resources and disconnects from the database.
      *
@@ -311,6 +345,9 @@ export class Transaction extends Kysely {
             executor: this.#props.executor.withoutPlugins(),
         });
     }
+    withTables() {
+        return new Transaction({ ...this.#props });
+    }
 }
 export function isKyselyProps(obj) {
     return (isObject(obj) &&

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

@@ -3,6 +3,73 @@ import { DialectAdapter } from '../dialect/dialect-adapter.js';
 export declare const MIGRATION_TABLE = "kysely_migration";
 export declare const MIGRATION_LOCK_TABLE = "kysely_migration_lock";
 export declare const MIGRATION_LOCK_ID = "migration_lock";
+export declare const NO_MIGRATIONS: NoMigrations;
+export declare type MigrationsOrFolderPath = Record<string, Migration> | string;
+export interface Migration {
+    up(db: Kysely<any>): Promise<void>;
+    down?(db: Kysely<any>): Promise<void>;
+}
+/**
+ * Type for the NO_MIGRATIONS constant. Never create one of these.
+ */
+export interface NoMigrations {
+    readonly __noMigrations__: true;
+}
+/**
+ * All migration methods ({@link MigrationModule.migrateTo | migrateTo},
+ * {@link MigrationModule.migrateToLatest | migrateToLatest} etc.) never
+ * throw but return this object instead.
+ */
+export interface MigrationResultSet {
+    /**
+     * This is defined if something went wrong.
+     *
+     * An error may have occurred in one of the migrations in which case the
+     * {@link results} list contains an item with `status === 'Error'` to
+     * indicate which migration failed.
+     *
+     * An error may also have occurred before Kysely was able to figure out
+     * which migrations should be executed, in which case the {@link results}
+     * list is undefined.
+     */
+    readonly error?: unknown;
+    /**
+     * {@link MigrationResult} for each individual migration that was supposed
+     * to be executed by the operation.
+     *
+     * If all went well, each result's `status` is `Success`. If some migration
+     * failed, the failed migration's result's `status` is `Error` and all
+     * results after that one have `status` ´NotExecuted`.
+     *
+     * This property can be undefined if an error occurred before Kysely was
+     * able to figure out which migrations should be executed.
+     *
+     * If this list is empty, there were no migrations to execute.
+     */
+    readonly results?: MigrationResult[];
+}
+export interface MigrationResult {
+    readonly migrationName: string;
+    /**
+     * The direction in which this migration was executed.
+     */
+    readonly direction: 'Up' | 'Down';
+    /**
+     * The execution status.
+     *
+     *  - `Success` means the migration was successfully executed. Note that
+     *    if any of the later migrations in the {@link MigrationResult.results}
+     *    list failed (have status `Error`) AND the dialect supports transactional
+     *    DDL, even the successfull migrations were rolled back.
+     *
+     *  - `Error` means the migration failed. In this case the
+     *    {@link MigrationResult.error} contains the error.
+     *
+     *  - `NotExecuted` means that the migration was supposed to be executed
+     *    but wasn't because an earlier migration failed.
+     */
+    readonly status: 'Success' | 'Error' | 'NotExecuted';
+}
 export declare class MigrationModule {
     #private;
     constructor(db: Kysely<any>, adapter: DialectAdapter);
@@ -10,26 +77,45 @@ export declare class MigrationModule {
      * Runs all migrations that have not yet been run.
      *
      * The only argument must either be a file path to the folder that contains all migrations
-     * OR an object that contains all migrations (not just the ones that need to be run).
+     * OR an object that contains all migrations (not just the ones that need to be executed).
      * The keys in the object must be the unique migration names.
      *
+     * This method returns a {@link MigrationResultSet} instance and _never_ throws.
+     * {@link MigrationResultSet.error} holds the error if something went wrong.
+     * {@link MigrationResultSet.results} contains information about which migrations
+     * were executed and which failed. See the examples below.
+     *
      * This method goes through all possible migrations (passed as the argument) and runs the
      * ones whose names are alphabetically after the last migration that has been run. If the
-     * list of executed migrations doesn't match the list of possible migrations, and error
-     * is thrown.
+     * list of executed migrations doesn't match the beginning of the list of possible migrations
+     * an error is thrown.
      *
      * ### Examples
      *
      * ```ts
-     * await db.migration.migrateToLatest(
+     * const { error, results } = await db.migration.migrateToLatest(
      *   path.join(__dirname, 'migrations')
      * )
+     *
+     * results?.forEach((it) => {
+     *   if (it.status === 'Success') {
+     *     console.log(`migration "${it.migrationName}" was executed successfully`)
+     *   } else if (it.status === 'Error') {
+     *     console.error(`failed to execute migration "${it.migrationName}"`)
+     *   }
+     * })
+     *
+     * if (error) {
+     *   console.error('failed to run `migrateToLatest`')
+     *   console.error(error)
+     * }
      * ```
      *
      * In the next example, we use a record of migration objects instead of file folder path.
      * The keys in the object are migration names that can be anything you want. The order of
      * the migrations is determined based on the alphabetical order of the keys in the record.
-     * This can be useful if you are using a bundler like webpack or esbuild.
+     * This version of the `migrateToLatest` method can be useful if you are using a bundler
+     * like webpack or esbuild.
      *
      * ```ts
      * await db.migration.migrateToLatest({
@@ -57,10 +143,67 @@ export declare class MigrationModule {
      * })
      * ```
      */
-    migrateToLatest(migrationsFolderPath: string): Promise<void>;
-    migrateToLatest(allMigrations: Record<string, Migration>): Promise<void>;
-}
-export interface Migration {
-    up(db: Kysely<any>): Promise<void>;
-    down?(db: Kysely<any>): Promise<void>;
+    migrateToLatest(migrationsFolderPath: string): Promise<MigrationResultSet>;
+    migrateToLatest(allMigrations: Record<string, Migration>): Promise<MigrationResultSet>;
+    /**
+     * Migrate up/down to a specific migration.
+     *
+     * Otherwise works just like {@link migrateToLatest}. The first argument
+     * behaves the same, the output is the same etc.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await db.migration.migrateTo(
+     *   path.join(__dirname, 'migrations'),
+     *   'some_migration'
+     * )
+     * ```
+     *
+     * If you specify the name of the first migration, this method migrates
+     * down to the first migration, but doesn't run the `down` migration for
+     * the first migration. In case you want to migrate down ALL migrations
+     * you can use a special constant `NO_MIGRATIONS`:
+     *
+     * ```ts
+     * await db.migration.migrateTo(
+     *   path.join(__dirname, 'migrations'),
+     *   NO_MIGRATIONS,
+     * )
+     * ```
+     */
+    migrateTo(migrationsFolderPath: string, targetMigrationName: string | NoMigrations): Promise<MigrationResultSet>;
+    migrateTo(allMigrations: Record<string, Migration>, targetMigrationName: string | NoMigrations): Promise<MigrationResultSet>;
+    /**
+     * Migrate one step up.
+     *
+     * Otherwise works just like {@link migrateToLatest}. The only argument
+     * behaves the same, the output is the same etc.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await db.migration.migrateUp(
+     *   path.join(__dirname, 'migrations'),
+     * )
+     * ```
+     */
+    migrateUp(migrationsFolderPath: string): Promise<MigrationResultSet>;
+    migrateUp(allMigrations: Record<string, Migration>): Promise<MigrationResultSet>;
+    /**
+     * Migrate one step down.
+     *
+     * Otherwise works just like {@link migrateToLatest}. The only argument
+     * behaves the same, the output is the same etc.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await db.migration.migrateDown(
+     *   path.join(__dirname, 'migrations'),
+     * )
+     * ```
+     */
+    migrateDown(migrationsFolderPath: string): Promise<MigrationResultSet>;
+    migrateDown(allMigrations: Record<string, Migration>): Promise<MigrationResultSet>;
 }