kysely 0.26.0 → 0.26.2

package/dist/cjs/util/type-utils.d.ts

@@ -40,9 +40,9 @@ export type AnyColumn<DB, TB extends keyof DB> = DrainOuterGeneric<{
 /**
  * Extracts a column type.
  */
-export type ExtractColumnType<DB, TB extends keyof DB, C> = {
+export type ExtractColumnType<DB, TB extends keyof DB, C> = DrainOuterGeneric<{
     [T in TB]: C extends keyof DB[T] ? DB[T][C] : never;
-}[TB];
+}[TB]>;
 /**
  * Given a database type and a union of table names in that db, returns
  * a union type with all possible `table`.`column` combinations.
@@ -74,21 +74,21 @@ export type ExtractColumnType<DB, TB extends keyof DB, C> = {
  * // Columns == 'person.id' | 'pet.name' | 'pet.species'
  * ```
  */
-export type AnyColumnWithTable<DB, TB extends keyof DB> = {
+export type AnyColumnWithTable<DB, TB extends keyof DB> = DrainOuterGeneric<{
     [T in TB]: T extends string ? keyof DB[T] extends string ? `${T}.${keyof DB[T]}` : never : never;
-}[TB];
+}[TB]>;
 /**
  * Just like {@link AnyColumn} but with a ` as <string>` suffix.
  */
-export type AnyAliasedColumn<DB, TB extends keyof DB> = {
+export type AnyAliasedColumn<DB, TB extends keyof DB> = DrainOuterGeneric<{
     [T in TB]: T extends string ? keyof DB[T] extends string ? `${keyof DB[T]} as ${string}` : never : never;
-}[TB];
+}[TB]>;
 /**
  * Just like {@link AnyColumnWithTable} but with a ` as <string>` suffix.
  */
-export type AnyAliasedColumnWithTable<DB, TB extends keyof DB> = {
+export type AnyAliasedColumnWithTable<DB, TB extends keyof DB> = DrainOuterGeneric<{
     [T in TB]: T extends string ? keyof DB[T] extends string ? `${T}.${keyof DB[T]} as ${string}` : never : never;
-}[TB];
+}[TB]>;
 /**
  * Extracts the item type of an array.
  */
@@ -124,9 +124,9 @@ export type IsAny<T> = 0 extends T & 1 ? true : false;
  * Evaluates to `true` if the types `T` and `U` are equal.
  */
 export type Equals<T, U> = (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2 ? true : false;
-export type NarrowPartial<S, T> = DrainOuterGeneric<{
+export type NarrowPartial<S, T> = DrainOuterGeneric<T extends object ? {
     [K in keyof S & string]: K extends keyof T ? T[K] extends S[K] ? T[K] : KyselyTypeError<`$narrowType() call failed: passed type does not exist in '${K}'s type union`> : S[K];
-}>;
+} : never>;
 export type SqlBool = boolean | 0 | 1;
 /**
  * Utility to reduce depth of TypeScript's internal type instantiation stack.

package/dist/esm/dialect/dialect-adapter-base.d.ts

@@ -1,5 +1,5 @@
 import { Kysely } from '../kysely.js';
-import { DialectAdapter } from './dialect-adapter.js';
+import { DialectAdapter, MigrationLockOptions } from './dialect-adapter.js';
 /**
  * A basic implementation of `DialectAdapter` with sensible default values.
  * 3rd party dialects can extend this instead of implementing the `DialectAdapter`
@@ -63,7 +63,7 @@ export declare abstract class DialectAdapterBase implements DialectAdapter {
      * `db` is a single connection (session) that will be used to execute the
      * migrations.
      */
-    abstract acquireMigrationLock(db: Kysely<any>): Promise<void>;
+    abstract acquireMigrationLock(db: Kysely<any>, options: MigrationLockOptions): Promise<void>;
     /**
      * Releases the migration lock. See {@link acquireMigrationLock}.
      *
@@ -72,5 +72,5 @@ export declare abstract class DialectAdapterBase implements DialectAdapter {
      * is a single connection (session) that was used to execute the migrations
      * and the `acquireMigrationLock` call.
      */
-    abstract releaseMigrationLock(db: Kysely<any>): Promise<void>;
+    abstract releaseMigrationLock(db: Kysely<any>, options: MigrationLockOptions): Promise<void>;
 }

package/dist/esm/dialect/mysql/mysql-adapter.d.ts

@@ -1,5 +1,6 @@
 import { Kysely } from '../../kysely.js';
 import { DialectAdapterBase } from '../dialect-adapter-base.js';
+import { MigrationLockOptions } from '../dialect-adapter.js';
 export declare class MysqlAdapter extends DialectAdapterBase {
     /**
      * Whether or not this dialect supports transactional DDL.
@@ -57,7 +58,7 @@ export declare class MysqlAdapter extends DialectAdapterBase {
      * `db` is a single connection (session) that will be used to execute the
      * migrations.
      */
-    acquireMigrationLock(db: Kysely<any>): Promise<void>;
+    acquireMigrationLock(db: Kysely<any>, _opt: MigrationLockOptions): Promise<void>;
     /**
      * Releases the migration lock. See {@link acquireMigrationLock}.
      *
@@ -66,5 +67,5 @@ export declare class MysqlAdapter extends DialectAdapterBase {
      * is a single connection (session) that was used to execute the migrations
      * and the `acquireMigrationLock` call.
      */
-    releaseMigrationLock(db: Kysely<any>): Promise<void>;
+    releaseMigrationLock(db: Kysely<any>, _opt: MigrationLockOptions): Promise<void>;
 }

package/dist/esm/dialect/mysql/mysql-adapter.js

@@ -10,7 +10,7 @@ export class MysqlAdapter extends DialectAdapterBase {
     get supportsReturning() {
         return false;
     }
-    async acquireMigrationLock(db) {
+    async acquireMigrationLock(db, _opt) {
         // Kysely uses a single connection to run the migrations. Because of that, we
         // can take a lock using `get_lock`. Locks acquired using `get_lock` get
         // released when the connection is destroyed (session ends) or when the lock
@@ -19,7 +19,7 @@ export class MysqlAdapter extends DialectAdapterBase {
         // MySQL if the process gets killed for some reason.
         await sql `select get_lock(${sql.lit(LOCK_ID)}, ${sql.lit(LOCK_TIMEOUT_SECONDS)})`.execute(db);
     }
-    async releaseMigrationLock(db) {
+    async releaseMigrationLock(db, _opt) {
         await sql `select release_lock(${sql.lit(LOCK_ID)})`.execute(db);
     }
 }

package/dist/esm/dialect/postgres/postgres-adapter.d.ts

@@ -1,5 +1,6 @@
 import { Kysely } from '../../kysely.js';
 import { DialectAdapterBase } from '../dialect-adapter-base.js';
+import { MigrationLockOptions } from '../dialect-adapter.js';
 export declare class PostgresAdapter extends DialectAdapterBase {
     /**
      * Whether or not this dialect supports transactional DDL.
@@ -57,7 +58,7 @@ export declare class PostgresAdapter extends DialectAdapterBase {
      * `db` is a single connection (session) that will be used to execute the
      * migrations.
      */
-    acquireMigrationLock(db: Kysely<any>): Promise<void>;
+    acquireMigrationLock(db: Kysely<any>, _opt: MigrationLockOptions): Promise<void>;
     /**
      * Releases the migration lock. See {@link acquireMigrationLock}.
      *
@@ -66,5 +67,5 @@ export declare class PostgresAdapter extends DialectAdapterBase {
      * is a single connection (session) that was used to execute the migrations
      * and the `acquireMigrationLock` call.
      */
-    releaseMigrationLock(): Promise<void>;
+    releaseMigrationLock(_db: Kysely<any>, _opt: MigrationLockOptions): Promise<void>;
 }

package/dist/esm/dialect/postgres/postgres-adapter.js

@@ -10,11 +10,11 @@ export class PostgresAdapter extends DialectAdapterBase {
     get supportsReturning() {
         return true;
     }
-    async acquireMigrationLock(db) {
+    async acquireMigrationLock(db, _opt) {
         // Acquire a transaction level advisory lock.
         await sql `select pg_advisory_xact_lock(${sql.lit(LOCK_ID)})`.execute(db);
     }
-    async releaseMigrationLock() {
+    async releaseMigrationLock(_db, _opt) {
         // Nothing to do here. `pg_advisory_xact_lock` is automatically released at the
         // end of the transaction and since `supportsTransactionalDdl` true, we know
         // the `db` instance passed to acquireMigrationLock is actually a transaction.

package/dist/esm/dialect/postgres/postgres-dialect-config.d.ts

@@ -8,7 +8,7 @@ export interface PostgresDialectConfig {
      *
      * If a function is provided, it's called once when the first query is executed.
      *
-     * https://node-postgres.com/api/pool
+     * https://node-postgres.com/apis/pool
      */
     pool: PostgresPool | (() => Promise<PostgresPool>);
     /**
@@ -35,7 +35,7 @@ export interface PostgresDialectConfig {
  *
  * We don't use the type from `pg` here to not have a dependency to it.
  *
- * https://node-postgres.com/api/pool
+ * https://node-postgres.com/apis/pool
  */
 export interface PostgresPool {
     connect(): Promise<PostgresPoolClient>;

package/dist/esm/dialect/sqlite/sqlite-adapter.d.ts

@@ -1,4 +1,6 @@
+import { Kysely } from '../../kysely.js';
 import { DialectAdapterBase } from '../dialect-adapter-base.js';
+import { MigrationLockOptions } from '../dialect-adapter.js';
 export declare class SqliteAdapter implements DialectAdapterBase {
     /**
      * Whether or not this dialect supports transactional DDL.
@@ -56,7 +58,7 @@ export declare class SqliteAdapter implements DialectAdapterBase {
      * `db` is a single connection (session) that will be used to execute the
      * migrations.
      */
-    acquireMigrationLock(): Promise<void>;
+    acquireMigrationLock(_db: Kysely<any>, _opt: MigrationLockOptions): Promise<void>;
     /**
      * Releases the migration lock. See {@link acquireMigrationLock}.
      *
@@ -65,5 +67,5 @@ export declare class SqliteAdapter implements DialectAdapterBase {
      * is a single connection (session) that was used to execute the migrations
      * and the `acquireMigrationLock` call.
      */
-    releaseMigrationLock(): Promise<void>;
+    releaseMigrationLock(_db: Kysely<any>, _opt: MigrationLockOptions): Promise<void>;
 }

package/dist/esm/dialect/sqlite/sqlite-adapter.js

@@ -6,12 +6,12 @@ export class SqliteAdapter {
     get supportsReturning() {
         return true;
     }
-    async acquireMigrationLock() {
+    async acquireMigrationLock(_db, _opt) {
         // SQLite only has one connection that's reserved by the migration system
         // for the whole time between acquireMigrationLock and releaseMigrationLock.
         // We don't need to do anything here.
     }
-    async releaseMigrationLock() {
+    async releaseMigrationLock(_db, _opt) {
         // SQLite only has one connection that's reserved by the migration system
         // for the whole time between acquireMigrationLock and releaseMigrationLock.
         // We don't need to do anything here.

package/dist/esm/driver/runtime-driver.js

@@ -9,15 +9,25 @@ export class RuntimeDriver {
     #driver;
     #log;
     #initPromise;
+    #initDone;
     #destroyPromise;
     #connections = new WeakSet();
     constructor(driver, log) {
+        this.#initDone = false;
         this.#driver = driver;
         this.#log = log;
     }
     async init() {
+        if (this.#destroyPromise) {
+            throw new Error('driver has already been destroyed');
+        }
         if (!this.#initPromise) {
-            this.#initPromise = this.#driver.init().catch((err) => {
+            this.#initPromise = this.#driver
+                .init()
+                .then(() => {
+                this.#initDone = true;
+            })
+                .catch((err) => {
                 this.#initPromise = undefined;
                 return Promise.reject(err);
             });
@@ -25,7 +35,12 @@ export class RuntimeDriver {
         await this.#initPromise;
     }
     async acquireConnection() {
-        await this.init();
+        if (this.#destroyPromise) {
+            throw new Error('driver has already been destroyed');
+        }
+        if (!this.#initDone) {
+            await this.init();
+        }
         const connection = await this.#driver.acquireConnection();
         if (!this.#connections.has(connection)) {
             if (this.#needsLogging()) {