@spfn/core 0.2.0-beta.64 → 0.2.0-beta.66

package/README.md

@@ -1,7 +1,8 @@
 # @spfn/core — Type-safe Next.js + Hono backend framework (route DSL → RPC proxy → typed client)
 
 `@spfn/core` is the backend runtime for SPFN: a tRPC-style **route DSL** (TypeBox-validated,
-end-to-end typed), a Drizzle/postgres.js **data layer**, an HTTP **server** entry point, and a
+end-to-end typed), a PostgreSQL Drizzle **data layer** (postgres.js by default, injectable
+providers such as PGlite), an HTTP **server** entry point, and a
 Next.js **RPC proxy + typed client** that wires a browser/RSC app to that backend with
 compile-time-only type inference.
 
@@ -13,23 +14,24 @@ end-to-end flow. Follow the links for API detail.
 ## Install
 
 ```bash
-pnpm add @spfn/core
+pnpm add @spfn/core drizzle-orm@1.0.0-rc.4
 # peer (optional): next ^15 || ^16
 # optional deps: ioredis (cache), ws (websocket events); pg-boss ships as a direct dep for jobs
 ```
 
 Node `>=18.18.0`. ESM-only.
 
-> **Apps that define entities must declare the Postgres driver directly:** add
-> `postgres` (and `pg`) to your app's `dependencies`. `@spfn/core` uses postgres.js
-> internally, and Drizzle branches its type resolution on the `postgres`/`pg` peer. If
-> the app doesn't pin the same driver, pnpm resolves `drizzle-orm` to a second instance,
-> `BaseRepository` generics collapse to `unknown`, and RPC responses lose their types.
+> **Apps that define entities must declare Drizzle and the Postgres driver directly:** add
+> `drizzle-orm@1.0.0-rc.4`, `postgres`, and `pg` to your app's `dependencies`.
+> `@spfn/core` consumes Drizzle as a peer, and Drizzle branches its type resolution on
+> optional driver peers. If the app doesn't pin the same ORM and drivers, pnpm can resolve
+> a second Drizzle instance, `BaseRepository` generics collapse to `unknown`, and RPC
+> responses lose their types.
 > `spfn create` adds these automatically; declare them by hand only when wiring SPFN into
 > an existing app.
 >
 > ```bash
-> pnpm add postgres pg
+> pnpm add drizzle-orm@1.0.0-rc.4 postgres pg
 > ```
 
 ## Modules

package/dist/db/index.d.ts

@@ -1,12 +1,48 @@
 import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
 import postgres, { Sql } from 'postgres';
-import * as drizzle_orm from 'drizzle-orm';
-import { SQL } from 'drizzle-orm';
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
-import { PgColumn, PgTable } from 'drizzle-orm/pg-core';
+import { PgAsyncDatabase, PgAsyncTransaction, PgColumn, PgTable } from 'drizzle-orm/pg-core';
+import * as drizzle_orm from 'drizzle-orm';
+import { InferSelectModel, SQL, InferInsertModel, AnyRelations, EmptyRelations } from 'drizzle-orm';
 import * as hono_types from 'hono/types';
 import { DatabaseError } from '@spfn/core/errors';
 
+/**
+ * Database Manager Types
+ */
+
+/**
+ * DB connection type
+ */
+type DbConnectionType = 'read' | 'write';
+/**
+ * Common base for PostgreSQL Drizzle drivers.
+ *
+ * Both the built-in postgres.js database and externally supplied drivers such
+ * as PGlite extend this class.
+ */
+type DrizzleDatabase = PgAsyncDatabase<any, any>;
+/** Default database type used by the environment-backed postgres.js path. */
+type DefaultDatabase = PostgresJsDatabase;
+/** Resolve the transaction type belonging to a PostgreSQL Drizzle database. */
+type DatabaseTransaction<TDatabase extends DrizzleDatabase> = TDatabase extends PgAsyncDatabase<infer TQueryResult, infer TRelations> ? PgAsyncTransaction<TQueryResult, TRelations> : never;
+/**
+ * An externally owned PostgreSQL Drizzle database.
+ *
+ * The provider owns connection creation. SPFN calls `close` at most once when
+ * `closeDatabase()` or server shutdown releases the registered provider.
+ */
+interface DatabaseProvider<TDatabase extends DrizzleDatabase = DrizzleDatabase> {
+    /** Primary database for writes (and reads when no replica is supplied). */
+    write: TDatabase;
+    /** Optional read replica. Falls back to `write`. */
+    read?: TDatabase;
+    /** Driver identifier used for diagnostics, for example `pglite`. */
+    kind: string;
+    /** Release provider-owned resources. */
+    close?: () => void | Promise<void>;
+}
+
 /**
  * Database Configuration
  *
@@ -23,11 +59,11 @@ import { DatabaseError } from '@spfn/core/errors';
  * - src/server/core/db/index.ts (main exports)
  */
 
-interface DatabaseClients {
+interface DatabaseClients<TDatabase extends DrizzleDatabase = PostgresJsDatabase> {
     /** Primary database for writes (or both read/write if no replica) */
-    write?: PostgresJsDatabase;
+    write?: TDatabase;
     /** Replica database for reads (optional, falls back to write) */
-    read?: PostgresJsDatabase;
+    read?: TDatabase;
     /** Raw postgres client for write operations (for cleanup) */
     writeClient?: Sql;
     /** Raw postgres client for read operations (for cleanup) */
@@ -71,6 +107,17 @@ interface DatabaseOptions {
      */
     monitoring?: Partial<MonitoringConfig>;
 }
+/** Database initialization options, including an optional external provider. */
+interface DatabaseInitOptions<TDatabase extends DrizzleDatabase = PostgresJsDatabase> extends DatabaseOptions {
+    /**
+     * Externally owned PostgreSQL Drizzle provider.
+     *
+     * When set, environment-based postgres.js initialization, health checks,
+     * and automatic reconnect are skipped. The provider's `close` callback is
+     * used during shutdown.
+     */
+    provider?: DatabaseProvider<TDatabase>;
+}
 /**
  * Connection pool configuration
  *
@@ -149,15 +196,6 @@ interface RetryConfig {
  */
 declare function createDatabaseFromEnv(options?: DatabaseOptions): Promise<DatabaseClients>;
 
-/**
- * Database Manager Types
- */
-
-/**
- * DB connection type
- */
-type DbConnectionType = 'read' | 'write';
-
 /**
  * Global Database instance manager
  * Provides singleton access to database across all modules
@@ -184,7 +222,7 @@ type DbConnectionType = 'read' | 'write';
  * const posts = await dbRead.select().from(postsTable);
  * ```
  */
-declare function getDatabase(type?: DbConnectionType): PostgresJsDatabase<Record<string, unknown>>;
+declare function getDatabase<TDatabase extends DrizzleDatabase = DefaultDatabase>(type?: DbConnectionType): TDatabase;
 /**
  * Set global database instances (for testing or manual configuration)
  *
@@ -214,9 +252,17 @@ declare function getDatabase(type?: DbConnectionType): PostgresJsDatabase<Record
  * setDatabase(undefined, undefined);
  * ```
  */
-declare function setDatabase(write: PostgresJsDatabase<Record<string, unknown>> | undefined, read?: PostgresJsDatabase<Record<string, unknown>> | undefined): void;
+declare function setDatabase<TDatabase extends DrizzleDatabase = DefaultDatabase>(write: TDatabase | undefined, read?: TDatabase | undefined): void;
+/**
+ * Register an externally owned PostgreSQL Drizzle provider.
+ *
+ * This is the synchronous/manual counterpart to `initDatabase({ provider })`.
+ * It performs no connection test. Use `closeDatabase()` to invoke the
+ * provider's close callback and clear the global instances.
+ */
+declare function setDatabaseProvider<TDatabase extends DrizzleDatabase>(provider: DatabaseProvider<TDatabase>): DatabaseClients<TDatabase>;
 /**
- * Initialize database from environment variables
+ * Initialize a database provider or create postgres.js clients from environment variables
  * Automatically called by server startup
  *
  * Supported environment variables:
@@ -261,14 +307,11 @@ declare function setDatabase(write: PostgresJsDatabase<Record<string, unknown>>
  * });
  * ```
  */
-declare function initDatabase(options?: DatabaseOptions): Promise<{
-    write?: PostgresJsDatabase<Record<string, unknown>>;
-    read?: PostgresJsDatabase<Record<string, unknown>>;
-}>;
+declare function initDatabase<TDatabase extends DrizzleDatabase = DefaultDatabase>(options?: DatabaseInitOptions<TDatabase>): Promise<DatabaseClients<TDatabase>>;
 /**
- * Close all database connections and cleanup
+ * Close the active database provider or postgres.js connections and clean up
  *
- * Properly closes postgres connection pools with timeout.
+ * Invokes an external provider's close callback, or closes postgres.js pools with timeout.
  * Should be called during graceful shutdown or after tests.
  *
  * @example
@@ -351,6 +394,7 @@ declare function getDatabaseInfo(): {
     hasWrite: boolean;
     hasRead: boolean;
     isReplica: boolean;
+    providerKind?: string;
 };
 
 /**
@@ -549,7 +593,7 @@ declare function generateDrizzleConfigFile(options?: DrizzleConfigOptions): stri
  * });
  * ```
  */
-declare function id(): drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm_pg_core.PgBigSerial53BuilderInitial<"id">>>;
+declare function id(): drizzle_orm_pg_core.SetIsPrimaryKey<drizzle_orm_pg_core.PgBigSerial53Builder>;
 /**
  * Standard timestamp fields (createdAt, updatedAt)
  *
@@ -576,8 +620,8 @@ declare function id(): drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm_
  * ```
  */
 declare function timestamps(): {
-    createdAt: drizzle_orm.NotNull<drizzle_orm.HasDefault<drizzle_orm_pg_core.PgTimestampBuilderInitial<"created_at">>>;
-    updatedAt: drizzle_orm.NotNull<drizzle_orm.HasDefault<drizzle_orm_pg_core.PgTimestampBuilderInitial<"updated_at">>>;
+    createdAt: drizzle_orm_pg_core.SetNotNull<drizzle_orm_pg_core.SetHasDefault<drizzle_orm_pg_core.PgTimestampBuilder>>;
+    updatedAt: drizzle_orm_pg_core.SetNotNull<drizzle_orm_pg_core.SetHasDefault<drizzle_orm_pg_core.PgTimestampBuilder>>;
 };
 /**
  * Foreign key reference to another table
@@ -602,7 +646,7 @@ declare function timestamps(): {
  */
 declare function foreignKey<T extends PgColumn>(name: string, reference: () => T, options?: {
     onDelete?: 'cascade' | 'set null' | 'restrict' | 'no action';
-}): drizzle_orm.NotNull<drizzle_orm_pg_core.PgBigInt53BuilderInitial<`${string}_id`>>;
+}): drizzle_orm_pg_core.SetNotNull<drizzle_orm_pg_core.PgBigInt53Builder>;
 /**
  * Optional foreign key reference (nullable)
  *
@@ -622,7 +666,7 @@ declare function foreignKey<T extends PgColumn>(name: string, reference: () => T
  */
 declare function optionalForeignKey<T extends PgColumn>(name: string, reference: () => T, options?: {
     onDelete?: 'cascade' | 'set null' | 'restrict' | 'no action';
-}): drizzle_orm_pg_core.PgBigInt53BuilderInitial<`${string}_id`>;
+}): drizzle_orm_pg_core.PgBigInt53Builder;
 /**
  * UUID primary key
  *
@@ -640,7 +684,7 @@ declare function optionalForeignKey<T extends PgColumn>(name: string, reference:
  * });
  * ```
  */
-declare function uuid(): drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm.HasDefault<drizzle_orm_pg_core.PgUUIDBuilderInitial<"id">>>>;
+declare function uuid(): drizzle_orm_pg_core.SetIsPrimaryKey<drizzle_orm_pg_core.SetHasDefault<drizzle_orm_pg_core.PgUUIDBuilder>>;
 /**
  * Audit fields for tracking record creators and updaters
  *
@@ -666,8 +710,8 @@ declare function uuid(): drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_or
  * ```
  */
 declare function auditFields(): {
-    createdBy: drizzle_orm_pg_core.PgTextBuilderInitial<"created_by", [string, ...string[]]>;
-    updatedBy: drizzle_orm_pg_core.PgTextBuilderInitial<"updated_by", [string, ...string[]]>;
+    createdBy: drizzle_orm_pg_core.PgTextBuilder<[string, ...string[]]>;
+    updatedBy: drizzle_orm_pg_core.PgTextBuilder<[string, ...string[]]>;
 };
 /**
  * Publishing fields for content management
@@ -698,8 +742,8 @@ declare function auditFields(): {
  * ```
  */
 declare function publishingFields(): {
-    publishedAt: drizzle_orm_pg_core.PgTimestampBuilderInitial<"published_at">;
-    publishedBy: drizzle_orm_pg_core.PgTextBuilderInitial<"published_by", [string, ...string[]]>;
+    publishedAt: drizzle_orm_pg_core.PgTimestampBuilder;
+    publishedBy: drizzle_orm_pg_core.PgTextBuilder<[string, ...string[]]>;
 };
 /**
  * Custom verification timestamp field
@@ -728,7 +772,7 @@ declare function publishingFields(): {
  * ```
  */
 declare function verificationTimestamp(fieldName: string): {
-    [x: string]: drizzle_orm_pg_core.PgTimestampBuilderInitial<string>;
+    [x: string]: drizzle_orm_pg_core.PgTimestampBuilder;
 };
 /**
  * Soft delete fields
@@ -762,8 +806,8 @@ declare function verificationTimestamp(fieldName: string): {
  * ```
  */
 declare function softDelete(): {
-    deletedAt: drizzle_orm_pg_core.PgTimestampBuilderInitial<"deleted_at">;
-    deletedBy: drizzle_orm_pg_core.PgTextBuilderInitial<"deleted_by", [string, ...string[]]>;
+    deletedAt: drizzle_orm_pg_core.PgTimestampBuilder;
+    deletedBy: drizzle_orm_pg_core.PgTextBuilder<[string, ...string[]]>;
 };
 /**
  * UTC timestamp field
@@ -795,7 +839,7 @@ declare function softDelete(): {
  * });
  * ```
  */
-declare function utcTimestamp(fieldName: string, mode?: 'date' | 'string'): drizzle_orm_pg_core.PgTimestampBuilderInitial<string>;
+declare function utcTimestamp(fieldName: string, mode?: 'date' | 'string'): drizzle_orm_pg_core.PgTimestampBuilder;
 /**
  * Type-safe enum text field
  *
@@ -829,7 +873,7 @@ declare function utcTimestamp(fieldName: string, mode?: 'date' | 'string'): driz
  * });
  * ```
  */
-declare function enumText<T extends readonly [string, ...string[]]>(fieldName: string, values: T): drizzle_orm_pg_core.PgTextBuilderInitial<string, drizzle_orm.Writable<T & [string, ...string[]]>>;
+declare function enumText<T extends readonly [string, ...string[]]>(fieldName: string, values: T): drizzle_orm_pg_core.PgTextBuilder<drizzle_orm.Writable<T & [string, ...string[]]>>;
 /**
  * Type-safe JSONB field
  *
@@ -872,7 +916,7 @@ declare function enumText<T extends readonly [string, ...string[]]>(fieldName: s
  * tags: typedJsonb<string[]>('tags').notNull(),
  * ```
  */
-declare function typedJsonb<T>(fieldName: string): drizzle_orm.$Type<drizzle_orm_pg_core.PgJsonbBuilderInitial<string>, T>;
+declare function typedJsonb<T>(fieldName: string): drizzle_orm_pg_core.Set$Type<drizzle_orm_pg_core.PgJsonbBuilder, T>;
 
 /**
  * Database Schema Helper
@@ -949,10 +993,9 @@ declare function getSchemaInfo(packageName: string): {
  */
 
 /**
- * Transaction database type
- * Uses Record<string, unknown> to accept any schema shape
+ * Transaction type belonging to a PostgreSQL Drizzle database.
  */
-type TransactionDB = PostgresJsDatabase<Record<string, unknown>>;
+type TransactionDB<TDatabase extends DrizzleDatabase = DefaultDatabase> = DatabaseTransaction<TDatabase>;
 /**
  * afterCommit callback type
  */
@@ -960,9 +1003,9 @@ type AfterCommitCallback = () => void | Promise<void>;
 /**
  * Transaction context stored in AsyncLocalStorage
  */
-type TransactionContext = {
+type TransactionContext<TDatabase extends DrizzleDatabase = DrizzleDatabase> = {
     /** The actual Drizzle transaction object */
-    tx: TransactionDB;
+    tx: TransactionDB<TDatabase>;
     /** Unique transaction ID for logging and tracing */
     txId: string;
     level: number;
@@ -974,13 +1017,13 @@ type TransactionContext = {
  *
  * @returns TransactionContext if available, null otherwise
  */
-declare function getTransactionContext(): TransactionContext | null;
+declare function getTransactionContext<TDatabase extends DrizzleDatabase = DefaultDatabase>(): TransactionContext<TDatabase> | null;
 /**
  * Get current transaction from AsyncLocalStorage
  *
  * @returns Transaction if available, null otherwise
  */
-declare function getTransaction(): TransactionDB | null;
+declare function getTransaction<TDatabase extends DrizzleDatabase = DefaultDatabase>(): TransactionDB<TDatabase> | null;
 /**
  * Run a function within a transaction context
  *
@@ -992,7 +1035,7 @@ declare function getTransaction(): TransactionDB | null;
  * @param callback - Function to run within transaction context
  * @returns Result of the callback
  */
-declare function runWithTransaction<T>(tx: TransactionDB, txId: string, // Add txId parameter
+declare function runWithTransaction<T, TDatabase extends DrizzleDatabase = DefaultDatabase>(tx: TransactionDB<TDatabase>, txId: string, // Add txId parameter
 callback: () => Promise<T>): Promise<T>;
 /**
  * Register a callback to run after the current transaction commits
@@ -1193,7 +1236,7 @@ interface RunInTransactionOptions {
  * @throws TransactionError if database not initialized or timeout exceeded
  * @throws Any error thrown by callback function
  */
-declare function runInTransaction<T>(callback: (tx: TransactionDB) => Promise<T>, options?: RunInTransactionOptions): Promise<T>;
+declare function runInTransaction<T, TDatabase extends DrizzleDatabase = DefaultDatabase>(callback: (tx: TransactionDB<TDatabase>) => Promise<T>, options?: RunInTransactionOptions): Promise<T>;
 
 /**
  * PostgreSQL Error Conversion Utilities
@@ -1247,14 +1290,6 @@ declare function fromPostgresError(error: any): DatabaseError;
  * ```
  */
 
-/**
- * Infer SELECT model from PgTable
- */
-type InferSelectModel<T extends PgTable> = T['$inferSelect'];
-/**
- * Infer INSERT model from PgTable
- */
-type InferInsertModel<T extends PgTable> = T['$inferInsert'];
 /**
  * Object-based where condition (AND only, equality only)
  */
@@ -1519,10 +1554,10 @@ declare function count<T extends PgTable>(table: T, where?: WhereObject<InferSel
  *
  * @example With Custom Schema Type
  * ```typescript
- * import type { AppSchema } from './schema';
+ * import type { AppRelations } from './relations';
  *
- * export class UserRepository extends BaseRepository<AppSchema> {
- *     // Now this.db and this.readDb are typed with AppSchema
+ * export class UserRepository extends BaseRepository<AppRelations> {
+ *     // Now this.db and this.readDb preserve the app's Drizzle relations
  * }
  * ```
  *
@@ -1542,6 +1577,8 @@ declare function count<T extends PgTable>(table: T, where?: WhereObject<InferSel
  * ```
  */
 
+/** Database surface available to repositories inside and outside transactions. */
+type RepositoryDatabase<TDatabase extends DrizzleDatabase> = TDatabase extends PgAsyncDatabase<infer TQueryResult, infer TRelations> ? PgAsyncDatabase<TQueryResult, TRelations> : never;
 /**
  * Enhanced error class that includes repository context
  */
@@ -1563,9 +1600,10 @@ declare class RepositoryError extends Error {
  * - Inside transaction: Uses transaction DB
  * - Outside transaction: Uses global DB instance (with read/write separation)
  *
- * @template TSchema - Database schema type (defaults to Record<string, unknown>)
+ * @template TRelations - Drizzle relations type (defaults to no relations)
+ * @template TDatabase - PostgreSQL Drizzle driver type (defaults to postgres.js)
  */
-declare abstract class BaseRepository<TSchema extends Record<string, unknown> = Record<string, unknown>> {
+declare abstract class BaseRepository<TRelations extends AnyRelations = EmptyRelations, TDatabase extends DrizzleDatabase = PostgresJsDatabase<TRelations>> {
     /**
      * Write database instance
      *
@@ -1582,7 +1620,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * }
      * ```
      */
-    protected get db(): PostgresJsDatabase<TSchema>;
+    protected get db(): RepositoryDatabase<TDatabase>;
     /**
      * Read database instance
      *
@@ -1603,7 +1641,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * }
      * ```
      */
-    protected get readDb(): PostgresJsDatabase<TSchema>;
+    protected get readDb(): RepositoryDatabase<TDatabase>;
     /**
      * Wrap query execution with repository context
      *
@@ -1649,7 +1687,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * const user = await this._findOne(users, eq(users.id, 1));
      * ```
      */
-    protected _findOne<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined): Promise<T['$inferSelect'] | null>;
+    protected _findOne<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined): Promise<InferSelectModel<T> | null>;
     /**
      * Find multiple records
      *
@@ -1671,7 +1709,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
         orderBy?: SQL | SQL[];
         limit?: number;
         offset?: number;
-    }): Promise<T['$inferSelect'][]>;
+    }): Promise<InferSelectModel<T>[]>;
     /**
      * Keyset (cursor) pagination — O(limit) instead of OFFSET's O(offset).
      *
@@ -1697,7 +1735,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
         after?: string | number | bigint | Date;
         order?: 'asc' | 'desc';
         where?: Record<string, any> | SQL | undefined;
-    }): Promise<T['$inferSelect'][]>;
+    }): Promise<InferSelectModel<T>[]>;
     /**
      * Create a new record
      *
@@ -1713,7 +1751,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * });
      * ```
      */
-    protected _create<T extends PgTable>(table: T, data: T['$inferInsert']): Promise<T['$inferSelect']>;
+    protected _create<T extends PgTable>(table: T, data: InferInsertModel<T>): Promise<InferSelectModel<T>>;
     /**
      * Create multiple records
      *
@@ -1729,7 +1767,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * ]);
      * ```
      */
-    protected _createMany<T extends PgTable>(table: T, data: T['$inferInsert'][]): Promise<T['$inferSelect'][]>;
+    protected _createMany<T extends PgTable>(table: T, data: InferInsertModel<T>[]): Promise<InferSelectModel<T>[]>;
     /**
      * Upsert a record (INSERT or UPDATE on conflict)
      *
@@ -1749,10 +1787,10 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * });
      * ```
      */
-    protected _upsert<T extends PgTable>(table: T, data: T['$inferInsert'], options: {
+    protected _upsert<T extends PgTable>(table: T, data: InferInsertModel<T>, options: {
         target: PgColumn[];
-        set?: Partial<T['$inferInsert']> | Record<string, SQL | any>;
-    }): Promise<T['$inferSelect']>;
+        set?: Partial<InferInsertModel<T>> | Record<string, SQL | any>;
+    }): Promise<InferSelectModel<T>>;
     /**
      * Update a single record
      *
@@ -1769,7 +1807,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * );
      * ```
      */
-    protected _updateOne<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined, data: Partial<T['$inferInsert']>): Promise<T['$inferSelect'] | null>;
+    protected _updateOne<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined, data: Partial<InferInsertModel<T>>): Promise<InferSelectModel<T> | null>;
     /**
      * Update multiple records
      *
@@ -1786,7 +1824,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * );
      * ```
      */
-    protected _updateMany<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined, data: Partial<T['$inferInsert']>): Promise<T['$inferSelect'][]>;
+    protected _updateMany<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined, data: Partial<InferInsertModel<T>>): Promise<InferSelectModel<T>[]>;
     /**
      * Delete a single record
      *
@@ -1799,7 +1837,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * const user = await this._deleteOne(users, { id: 1 });
      * ```
      */
-    protected _deleteOne<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined): Promise<T['$inferSelect'] | null>;
+    protected _deleteOne<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined): Promise<InferSelectModel<T> | null>;
     /**
      * Delete multiple records
      *
@@ -1812,7 +1850,7 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
      * const users = await this._deleteMany(users, { verified: false });
      * ```
      */
-    protected _deleteMany<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined): Promise<T['$inferSelect'][]>;
+    protected _deleteMany<T extends PgTable>(table: T, where: Record<string, any> | SQL | undefined): Promise<InferSelectModel<T>[]>;
     /**
      * Count records
      *
@@ -1829,4 +1867,4 @@ declare abstract class BaseRepository<TSchema extends Record<string, unknown> =
     protected _count<T extends PgTable>(table: T, where?: Record<string, any> | SQL | undefined): Promise<number>;
 }
 
-export { type AfterCommitCallback, BaseRepository, type DatabaseClients, type DrizzleConfigOptions, type PoolConfig, RepositoryError, type RetryConfig, type RunInTransactionOptions, type TransactionContext, type TransactionDB, Transactional, type TransactionalOptions, auditFields, checkConnection, closeDatabase, count, create, createDatabaseConnection, createDatabaseFromEnv, createMany, createSchema, deleteMany, deleteOne, detectDialect, enumText, findMany, findOne, forceReconnectDatabase, foreignKey, fromPostgresError, generateDrizzleConfigFile, getDatabase, getDatabaseInfo, getDrizzleConfig, getSchemaInfo, getTransaction, getTransactionContext, id, initDatabase, isConnectionLevelError, onAfterCommit, optionalForeignKey, packageNameToSchema, publishingFields, reportDatabaseError, resetConnectionErrorCounter, runInTransaction, runWithTransaction, setDatabase, softDelete, timestamps, typedJsonb, updateMany, updateOne, upsert, utcTimestamp, uuid, verificationTimestamp };
+export { type AfterCommitCallback, BaseRepository, type DatabaseClients, type DatabaseInitOptions, type DatabaseOptions, type DatabaseProvider, type DatabaseTransaction, type DefaultDatabase, type DrizzleConfigOptions, type DrizzleDatabase, type PoolConfig, type RepositoryDatabase, RepositoryError, type RetryConfig, type RunInTransactionOptions, type TransactionContext, type TransactionDB, Transactional, type TransactionalOptions, auditFields, checkConnection, closeDatabase, count, create, createDatabaseConnection, createDatabaseFromEnv, createMany, createSchema, deleteMany, deleteOne, detectDialect, enumText, findMany, findOne, forceReconnectDatabase, foreignKey, fromPostgresError, generateDrizzleConfigFile, getDatabase, getDatabaseInfo, getDrizzleConfig, getSchemaInfo, getTransaction, getTransactionContext, id, initDatabase, isConnectionLevelError, onAfterCommit, optionalForeignKey, packageNameToSchema, publishingFields, reportDatabaseError, resetConnectionErrorCounter, runInTransaction, runWithTransaction, setDatabase, setDatabaseProvider, softDelete, timestamps, typedJsonb, updateMany, updateOne, upsert, utcTimestamp, uuid, verificationTimestamp };