@stacksjs/database 0.72.22 → 0.72.24

package/dist/index.d.ts

@@ -10,6 +10,8 @@ export type {
   PostgresConfig,
   SqliteConfig,
 } from './driver-config';
+// Core database utilities and default instance
+export type { FrameworkSchema } from './framework-schema';
 export type { SchemaDriftColumn, SchemaDriftReport } from './schema-drift';
 export type { DeclaredFK, FkAuditResult, FkOrphan, FkOrphanReport, LiveFK } from './fk-audit';
 export type { DeclaredUnique, LiveUniqueIndex, UniqueAuditResult } from './unique-audit';
@@ -74,7 +76,6 @@ export {
   mergeWithDefaults,
   validateDriverConfig,
 } from './driver-config';
-// Core database utilities and default instance
 export * from './utils';
 // Types (compatibility layer for Kysely types)
 export * from './types';

package/dist/utils.d.ts

@@ -1,12 +1,11 @@
 import { createQueryBuilder, setConfig } from '@stacksjs/query-builder';
+import type { FrameworkSchema } from './framework-schema';
 import type { QueryHooks } from '@stacksjs/query-builder';
 export declare function acquireDbConfigLock(): Promise<() => void>;
 // Function to initialize the config when it's available
 export declare function initializeDbConfig(config: any): void;
 export declare function createDatabaseQueryHooks(dispatch: (event: DatabaseQueryLogEvent) => void | Promise<void>): QueryHooks;
-declare function ensureConfigLoaded(): Promise<void>;
 export declare function ensureDatabaseConfigLoaded(): Promise<void>;
-declare function getDb(): ReturnType<typeof createQueryBuilder>;
 /**
  * Discard every cached database client after the underlying query-builder
  * connection is reset.
@@ -19,24 +18,46 @@ declare function getDb(): ReturnType<typeof createQueryBuilder>;
  */
 export declare function resetDatabaseConnection(): void;
 /**
- * The builder a read should use right now.
+ * Fluent chain returned by entry-point methods like `selectFrom`/`updateTable`.
+ *
+ * bun-query-builder marks legacy chain methods (e.g. `selectAll`, `whereILike`,
+ * `selectAllRelations`) as optional in its declarations even though they're
+ * always present at runtime. Re-typing them here avoids forcing every call
+ * site to use `?.()` or `!` on the chain.
+ *
+ * **The chain carries its row type.** `TRow` comes from the augmented
+ * `DatabaseSchema` that `buddy generate:db-types` writes, so
+ * `db.selectFrom('users').executeTakeFirst()` answers a `users` row rather than
+ * `any` - and `select(['id', 'handle'])` narrows it to those two columns.
+ *
+ * Every terminal used to be `Promise<any>`, and the cost was not theoretical:
+ * an application on top of this ends up annotating every result `any` to say
+ * what it already knows, which is a thousand places the compiler has been told
+ * to stop looking. A row it cannot type is `Record<string, unknown>` instead -
+ * still a value the caller has to narrow, but one narrowing it is checked.
  *
- * Falls back to the primary whenever routing is not permitted — no
- * replicas configured, auto-routing off, inside a transaction, or after a
- * write in this async context. See `./replicas` for why each of those
- * carve-outs exists.
+ * A join or an aliased select list widens the row to
+ * `Record<string, unknown>`: the shape then depends on the aliases rather than
+ * on any one table, and claiming otherwise would be worse than not knowing.
  */
-declare function getReadDb(): ReturnType<typeof createQueryBuilder>;
 /**
- * Explicitly replica-routed handle: `db.read.selectFrom('users')`.
+ * State the shape of rows this package knows and the query cannot.
+ *
+ * A raw query answers `Record<string, unknown>` when the table is not in the
+ * generated `DatabaseSchema` - which is always true *inside* the framework,
+ * because an application's schema does not exist at framework build time. The
+ * package that ships the model does know the shape, and this is where that
+ * knowledge is written down: once, at the boundary, named and greppable.
+ *
+ * It is an assertion, and deliberately an obvious one. What it replaces is a
+ * `Promise<any>` that spread the same claim silently through every caller.
  *
- * Unlike automatic routing this ignores `reads.autoRoute` — asking for
- * `db.read` IS the statement that this particular query tolerates a stale
- * result. It still respects the transaction carve-out, because a read
- * inside a transaction must see that transaction's own writes no matter
- * how it was requested.
+ * Application code should not need it: `buddy generate:db-types` gives `db` the
+ * real column types, and a row that arrives typed does not want asserting.
  */
-declare function getExplicitReadDb(): ReturnType<typeof createQueryBuilder>;
+export declare function asRows<TRow>(rows: ReadonlyArray<Record<string, unknown>>): TRow[];
+/** The single-row form of {@link asRows}. */
+export declare function asRow<TRow>(row: Record<string, unknown> | undefined): TRow | undefined;
 /**
  * Update bun-query-builder configuration
  */
@@ -64,15 +85,11 @@ export declare const RAW_QUERY_SOFT_DELETE_CONFIG: {
   column: 'deleted_at';
   defaultFilter: true
 };
-/** Statements that mutate, for the read-your-writes tracking in `./replicas`. */
-declare const WRITE_ENTRY_POINTS: Set<any>;
-/** Reads that are candidates for replica routing. */
-declare const READ_ENTRY_POINTS: Set<any>;
 /**
  * Lazy proxy for the query builder - connection is only made when first used.
  * This is the main entry point for database operations.
  */
-export declare const db: Proxy;
+export declare const db: Db;
 /**
  * Replica-routed handle exposed as `db.read`.
  *
@@ -80,7 +97,7 @@ export declare const db: Proxy;
  * available behind it (`db.read.selectFrom(...).where(...)`) without
  * re-declaring every chain entry point.
  */
-export declare const readDb: Proxy;
+export declare const readDb: Omit<Db, 'read'>;
 export declare interface DatabaseQueryLogEvent {
   query: {
     sql: string
@@ -90,90 +107,97 @@ export declare interface DatabaseQueryLogEvent {
   error?: unknown
 }
 /**
- * Fluent chain returned by entry-point methods like `selectFrom`/`updateTable`.
+ * What an insert reports when it was not asked to return rows.
  *
- * bun-query-builder marks legacy chain methods (e.g. `selectAll`, `whereILike`,
- * `selectAllRelations`) as optional in its declarations even though they're
- * always present at runtime. Re-typing them here avoids forcing every call
- * site to use `?.()` or `!` on the chain.
+ * Every field optional and every one differently named, because drivers
+ * disagree: Postgres answers a count, SQLite a `changes`, MySQL an `insertId`.
+ * Typing this as the row - which is what the query builder's own declarations
+ * do - is how framework code came to read `insertId` off a value that is not a
+ * row and cannot have one.
  *
- * Returns are typed as `any` deliberately — typing each variant precisely
- * would re-introduce the optional methods, and we already lose strict column
- * typing one step into a chain (the underlying query builder is constructed
- * with no schema). Tests cover the runtime semantics.
+ * `returning(...)` is the way to get rows out of an insert, and it changes the
+ * chain's kind so the types follow.
  */
-export declare interface FluentChain {
-  where(callback: (eb: import('./types').StacksExpressionBuilder) => unknown): FluentChain
-  where(...args: any[]): FluentChain
-  whereNull: (...args: any[]) => FluentChain
-  whereNotNull: (...args: any[]) => FluentChain
-  whereIn: (...args: any[]) => FluentChain
-  whereNotIn: (...args: any[]) => FluentChain
-  whereLike: (...args: any[]) => FluentChain
-  whereNotLike: (...args: any[]) => FluentChain
-  whereILike: (...args: any[]) => FluentChain
-  whereNotILike: (...args: any[]) => FluentChain
-  whereBetween: (...args: any[]) => FluentChain
-  whereNotBetween: (...args: any[]) => FluentChain
-  whereRaw: (...args: any[]) => FluentChain
-  whereColumn: (...args: any[]) => FluentChain
-  orWhere: (...args: any[]) => FluentChain
-  orWhereNull: (...args: any[]) => FluentChain
-  orWhereNotNull: (...args: any[]) => FluentChain
-  orWhereIn: (...args: any[]) => FluentChain
-  orWhereNotIn: (...args: any[]) => FluentChain
-  orWhereLike: (...args: any[]) => FluentChain
-  orWhereNotLike: (...args: any[]) => FluentChain
-  orWhereILike: (...args: any[]) => FluentChain
-  orWhereColumn: (...args: any[]) => FluentChain
-  andWhere: (...args: any[]) => FluentChain
-  whereAny: (...args: any[]) => FluentChain
-  whereAll: (...args: any[]) => FluentChain
-  whereNone: (...args: any[]) => FluentChain
-  having: (...args: any[]) => FluentChain
-  groupBy: (...args: any[]) => FluentChain
-  orderBy: (...args: any[]) => FluentChain
-  limit: (...args: any[]) => FluentChain
-  offset: (...args: any[]) => FluentChain
-  select(selection: ((eb: import('./types').StacksExpressionBuilder) => unknown) | ReadonlyArray<string | ((eb: import('./types').StacksExpressionBuilder) => unknown) | unknown>): FluentChain
-  select(...args: any[]): FluentChain
-  selectAll: () => FluentChain
-  selectAllRelations: () => FluentChain
-  selectRaw: (...args: any[]) => FluentChain
-  distinct: () => FluentChain
-  distinctOn: (...args: any[]) => FluentChain
-  innerJoin: (...args: any[]) => FluentChain
-  leftJoin: (...args: any[]) => FluentChain
-  rightJoin: (...args: any[]) => FluentChain
-  fullJoin: (...args: any[]) => FluentChain
-  crossJoin: (...args: any[]) => FluentChain
-  with: (...args: any[]) => FluentChain
-  union: (...args: any[]) => FluentChain
-  unionAll: (...args: any[]) => FluentChain
-  values: (...args: any[]) => FluentChain
-  set: (...args: any[]) => FluentChain
-  returning: (...args: any[]) => FluentChain
-  returningAll: () => FluentChain
-  onConflict: (...args: any[]) => FluentChain
-  onDuplicateKeyUpdate: (...args: any[]) => FluentChain
-  onConflictDoNothing: (...args: any[]) => FluentChain
-  onDuplicateKeyIgnore: () => FluentChain
-  forUpdate: () => FluentChain
-  forShare: () => FluentChain
+export declare interface InsertReceipt {
+  insertId?: number | bigint
+  numInsertedOrUpdatedRows?: number | bigint
+  numAffectedRows?: number | bigint
+  affectedRows?: number
+  changes?: number
+}
+export declare interface BaseFluentChain<TRow = Record<string, unknown>, TKind extends ChainKind = 'select'> {
+  where(callback: (eb: import('./types').StacksExpressionBuilder) => unknown): FluentChain<TRow, TKind>
+  where(...args: unknown[]): FluentChain<TRow, TKind>
+  whereNull: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereNotNull: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereIn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereNotIn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereLike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereNotLike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereILike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereNotILike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereBetween: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereNotBetween: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereRaw: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereColumn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhere: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereNull: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereNotNull: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereIn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereNotIn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereLike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereNotLike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereILike: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orWhereColumn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  andWhere: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereAny: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereAll: (...args: unknown[]) => FluentChain<TRow, TKind>
+  whereNone: (...args: unknown[]) => FluentChain<TRow, TKind>
+  having: (...args: unknown[]) => FluentChain<TRow, TKind>
+  groupBy: (...args: unknown[]) => FluentChain<TRow, TKind>
+  orderBy: (...args: unknown[]) => FluentChain<TRow, TKind>
+  limit: (...args: unknown[]) => FluentChain<TRow, TKind>
+  offset: (...args: unknown[]) => FluentChain<TRow, TKind>
+  select<K extends KnownKeys<TRow> & string>(columns: readonly K[]): FluentChain<Pick<TRow, K>, TKind>
+  select(selection: ((eb: import('./types').StacksExpressionBuilder) => unknown) | ReadonlyArray<string | ((eb: import('./types').StacksExpressionBuilder) => unknown) | unknown>): FluentChain<Record<string, unknown>, TKind>
+  select(...args: unknown[]): FluentChain<Record<string, unknown>, TKind>
+  selectAll: () => FluentChain<TRow, TKind>
+  selectAllRelations: () => FluentChain<Record<string, unknown>, TKind>
+  selectRaw: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  distinct: () => FluentChain<TRow, TKind>
+  distinctOn: (...args: unknown[]) => FluentChain<TRow, TKind>
+  innerJoin: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  leftJoin: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  rightJoin: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  fullJoin: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  crossJoin: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  with: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  union: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  unionAll: (...args: unknown[]) => FluentChain<Record<string, unknown>, TKind>
+  values: (values: Partial<TRow> | ReadonlyArray<Partial<TRow>> | object | readonly object[]) => FluentChain<TRow, TKind>
+  set: (values: Partial<TRow> | object) => FluentChain<TRow, TKind>
+  returning<K extends KnownKeys<TRow> & string>(columns: readonly K[]): FluentChain<Pick<TRow, K>, 'returning'>
+  returning(...args: unknown[]): FluentChain<Record<string, unknown>, 'returning'>
+  returningAll: () => FluentChain<TRow, 'returning'>
+  onConflict: (...args: unknown[]) => FluentChain<TRow, TKind>
+  onDuplicateKeyUpdate: (...args: unknown[]) => FluentChain<TRow, TKind>
+  onConflictDoNothing: (...args: unknown[]) => FluentChain<TRow, TKind>
+  onDuplicateKeyIgnore: () => FluentChain<TRow, TKind>
+  forUpdate: () => FluentChain<TRow, TKind>
+  forShare: () => FluentChain<TRow, TKind>
   toSQL: () => string
-  execute: () => Promise<any>
-  executeTakeFirst: () => Promise<any>
-  executeTakeFirstOrThrow: () => Promise<any>
-  pluck: (...args: any[]) => Promise<any>
-  count: (...args: any[]) => Promise<number>
-  sum: (...args: any[]) => Promise<number>
-  avg: (...args: any[]) => Promise<number>
-  min: (...args: any[]) => Promise<any>
-  max: (...args: any[]) => Promise<any>
+  execute: () => Promise<ResultOf<TRow, TKind>>
+  executeTakeFirst: () => Promise<FirstOf<TRow, TKind>>
+  executeTakeFirstOrThrow: () => Promise<NonNullable<FirstOf<TRow, TKind>>>
+  pluck: (...args: unknown[]) => Promise<unknown[]>
+  count: (...args: unknown[]) => Promise<number>
+  sum: (...args: unknown[]) => Promise<number>
+  avg: (...args: unknown[]) => Promise<number>
+  min: (...args: unknown[]) => Promise<unknown>
+  max: (...args: unknown[]) => Promise<unknown>
   exists: () => Promise<boolean>
   doesntExist: () => Promise<boolean>
-  $call: (callback: (query: FluentChain) => FluentChain) => FluentChain
-  [key: string]: any
+  $call: (callback: (query: FluentChain<TRow, TKind>) => FluentChain<TRow, TKind>) => FluentChain<TRow, TKind>
 }
 /*.ts` and
  * emits `database/types.d.ts` containing:
@@ -197,20 +221,83 @@ export declare interface FluentChain {
 export declare interface DatabaseSchema {}
 declare interface Db extends Pick<Required<RawQueryBuilder>, GenericPassthroughKeys> {
   fn: import('./types').ExpressionFunctions
-  selectFrom: (table: TableName) => FluentChain
-  insertInto: (table: TableName) => FluentChain
-  updateTable: (table: TableName) => FluentChain
-  deleteFrom: (table: TableName) => FluentChain
-  table: (table: TableName) => FluentChain
-  selectFromSub: (sub: any, alias: string) => FluentChain
-  select: (table: TableName, ...columns: string[]) => FluentChain
-  unsafe: (query: string, params?: any[]) => UnsafeReturn
+  selectFrom: <T extends TableName>(table: T) => FluentChain<RowOf<T>, 'select'>
+  insertInto: <T extends TableName>(table: T) => FluentChain<RowOf<T>, 'insert'>
+  updateTable: <T extends TableName>(table: T) => FluentChain<RowOf<T>, 'update'>
+  deleteFrom: <T extends TableName>(table: T) => FluentChain<RowOf<T>, 'delete'>
+  table: <T extends TableName>(table: T) => FluentChain<RowOf<T>, 'select'>
+  selectFromSub: (sub: unknown, alias: string) => FluentChain<Record<string, unknown>>
+  select: <T extends TableName>(table: T, ...columns: string[]) => FluentChain<Record<string, unknown>>
+  unsafe: (query: string, params?: unknown[]) => UnsafeReturn
   read: Omit<Db, 'read'>
 }
 // The bun-query-builder types `unsafe()` as returning `Promise<any>`, but at
 // runtime it returns a Bun SQL Statement that has `.execute()`. This interface
 // corrects the return type so callers can chain `.execute()` without type errors.
 declare type UnsafeReturn = Promise<any> & { execute: () => Promise<any> }
+/**
+ * The keys a row type actually declares, or `never` for a loose record.
+ *
+ * `keyof Record<string, unknown>` is `string`, so a narrowing overload written
+ * against it will happily accept *anything* as a column - including
+ * `'menu_items.id as id'`, which then becomes a property name in the result
+ * type. That is worse than not narrowing: the row type looks specific and every
+ * key in it is fiction.
+ */
+export type KnownKeys<T> = string extends keyof T ? never : keyof T;
+/**
+ * Which verb started a chain, so its terminals can answer the right thing.
+ *
+ * `returning` is its own kind rather than a flag on the others: a mutation with
+ * `RETURNING` answers rows, and that is the difference between reading
+ * `rows[0].id` and reading a count.
+ */
+export type ChainKind = 'select' | 'insert' | 'update' | 'delete' | 'returning';
+/** What `execute()` resolves to for each verb. */
+export type ResultOf<TRow, TKind extends ChainKind> = TKind extends 'select' | 'returning'
+  ? TRow[]
+  : number;
+/**
+ * What `executeTakeFirst()` resolves to for each verb.
+ *
+ * The counts are *required*, because the runtime always sets them: an update
+ * that changed nothing answers `{ numUpdatedRows: 0 }`. Declaring them optional
+ * would make every caller write `?? 0` for a case that cannot happen.
+ */
+export type FirstOf<TRow, TKind extends ChainKind> = TKind extends 'select' | 'returning'
+  ? TRow | undefined
+  : TKind extends 'insert'
+    ? InsertReceipt | undefined
+    : TKind extends 'update'
+      ? { numUpdatedRows: number }
+      : { numDeletedRows: number }
+/** `created_at` -> `CreatedAt`, for the dynamic helper names below. */
+declare type SnakeToPascal<S extends string> = S extends `${infer Head}_${infer Tail}`
+  ? `${Capitalize<Head>}${SnakeToPascal<Tail>}`
+  : Capitalize<S>;
+/**
+ * The dynamic `where<Column>` helpers bun-query-builder generates.
+ *
+ * Derived from the row type rather than allowed by an index signature. The
+ * index signature that used to be here (`[key: string]: any`) made every
+ * misspelling legal and every result `any`: `whereHndle('a')` compiled, and so
+ * did reading a property that does not exist.
+ */
+export type DynamicWhereMethods<TRow, TKind extends ChainKind = 'select'> = {
+  [K in keyof TRow & string as `where${SnakeToPascal<K>}`]: (value: TRow[K]) => FluentChain<TRow, TKind>
+} & {
+  [K in keyof TRow & string as `orWhere${SnakeToPascal<K>}`]: (value: TRow[K]) => FluentChain<TRow, TKind>
+} & {
+  [K in keyof TRow & string as `andWhere${SnakeToPascal<K>}`]: (value: TRow[K]) => FluentChain<TRow, TKind>
+}
+/**
+ * A chain over one table's rows: the methods, plus the generated helpers.
+ *
+ * A type alias rather than an interface because the helper half is a mapped
+ * type over `TRow`, and an interface can only extend members TypeScript knows
+ * statically.
+ */
+export type FluentChain<TRow = Record<string, unknown>, TKind extends ChainKind = 'select'> = BaseFluentChain<TRow, TKind> & DynamicWhereMethods<TRow, TKind>;
 /**
  * Top-level surface of the lazy `db` proxy. Methods that return a chainable
  * builder are typed as `FluentChain` to flatten the optional-method noise
@@ -261,7 +348,28 @@ declare type GenericPassthroughKeys = | 'transaction'
  * well-documented LiteralUnion trick.
  */
 // eslint-disable-next-line ts/no-empty-object-type
-export type TableName = (keyof DatabaseSchema & string) | (string & {});
+export type TableName = (keyof DatabaseSchema & string) | (keyof FrameworkSchema & string) | (string & {});
+/**
+ * The row type of a registered table, or an unknown-valued record.
+ *
+ * A table the generated `DatabaseSchema` knows answers its own columns. One it
+ * does not - an app that has never run `buddy generate:db-types`, or a table
+ * that lives outside a model - answers `Record<string, unknown>`: still a value
+ * the caller narrows, but narrowing it is checked rather than waved through.
+ */
+export type RowOf<T extends TableName> = T extends keyof DatabaseSchema
+  ? Shape<DatabaseSchema[T]>
+  : T extends keyof FrameworkSchema
+    ? Shape<FrameworkSchema[T]>
+    : Record<string, unknown>;
+/**
+ * A generated entry, whichever of the two shapes it was written in.
+ *
+ * The app generator has emitted a flat column record for a while; the
+ * `{ columns }` form is what the query builder's own schema type uses. Both are
+ * accepted so an app does not have to regenerate to keep compiling.
+ */
+declare type Shape<T> = T extends { columns: infer C } ? C : T;
 // SQLite bootstrap pragmas (stacksjs/stacks#1951) now live in
 // @stacksjs/query-builder — the one chokepoint every framework
 // query-builder instance is created through — so EVERY fresh sqlite

package/dist/utils.js

@@ -1 +1 @@
-import{AsyncLocalStorage}from"node:async_hooks";import{createQueryBuilder,registerPersistentQueryHooks,resetConnection as resetQueryBuilderConnection,setConfig}from"@stacksjs/query-builder";import{SQL}from"bun";import{env as envVars}from"@stacksjs/env";import{getConnectionDefaults}from"./defaults";import{isMysqlWire,isVitessSharded,toQueryBuilderDialect}from"./dialect";import{relativeMigrationDirectory,resolveMigrationDirectory}from"./migration-path";import{contextInTransaction,markContextWrote,resolveReplicaConnection,selectReplica,shouldRouteToReplica,withTransactionContext}from"./replicas";import{aggregateFunctions}from"./types";const sqliteDefaults=getConnectionDefaults("sqlite",envVars),mysqlDefaults=getConnectionDefaults("mysql",envVars),postgresDefaults=getConnectionDefaults("postgres",envVars);let appEnv=envVars.APP_ENV||"local",dbDriver=envVars.DB_CONNECTION||"sqlite",dbConfig={connections:{sqlite:{database:sqliteDefaults.database,prefix:""},mysql:{name:mysqlDefaults.database,host:mysqlDefaults.host,username:mysqlDefaults.username,password:mysqlDefaults.password,port:mysqlDefaults.port,prefix:""},singlestore:{name:mysqlDefaults.database,host:mysqlDefaults.host,username:mysqlDefaults.username,password:mysqlDefaults.password,port:mysqlDefaults.port,prefix:""},vitess:{name:mysqlDefaults.database,host:mysqlDefaults.host,username:mysqlDefaults.username,password:mysqlDefaults.password,port:15306,prefix:"",sharded:isVitessSharded()},postgres:{name:postgresDefaults.database,host:postgresDefaults.host,username:postgresDefaults.username,password:postgresDefaults.password,port:postgresDefaults.port,prefix:""}}},dbConfigLockTail=Promise.resolve();export function acquireDbConfigLock(){let release=()=>{};const held=new Promise((resolve)=>{release=resolve}),acquired=dbConfigLockTail.then(()=>release);dbConfigLockTail=dbConfigLockTail.then(()=>held);return acquired}export function initializeDbConfig(config){if(config?.app?.env)appEnv=config.app.env;if(config?.database?.default)dbDriver=config.database.default;if(config?.database)dbConfig=config.database;updateQueryBuilderConfig();_dbInstance=null;_replicaInstances=new Map}function getEnv(){return appEnv}function getDriver(){return dbDriver}function getDatabaseConfig(){return dbConfig}function getDialect(){return toQueryBuilderDialect(getDriver())}function getDbConfig(){const driver=getDriver(),database=getDatabaseConfig(),env=getEnv();if(driver==="sqlite"){const defaultName=env!=="testing"?"database/stacks.sqlite":"database/stacks_testing.sqlite";return{database:database.connections?.sqlite?.database??defaultName}}if(driver==="mysql")return{database:database.connections?.mysql?.name||"stacks",host:database.connections?.mysql?.host??"127.0.0.1",username:database.connections?.mysql?.username??"root",password:database.connections?.mysql?.password??"",port:database.connections?.mysql?.port??3306};if(driver==="singlestore")return{database:database.connections?.singlestore?.name||"stacks",host:database.connections?.singlestore?.host??"127.0.0.1",username:database.connections?.singlestore?.username??"root",password:database.connections?.singlestore?.password??"",port:database.connections?.singlestore?.port??3306};if(driver==="vitess")return{database:database.connections?.vitess?.name||"stacks",host:database.connections?.vitess?.host??"127.0.0.1",username:database.connections?.vitess?.username??"root",password:database.connections?.vitess?.password??"",port:database.connections?.vitess?.port??15306};if(driver==="postgres"){const dbName=database.connections?.postgres?.name??"stacks";return{database:env==="testing"?`${dbName}_testing`:dbName,host:database.connections?.postgres?.host??"127.0.0.1",username:database.connections?.postgres?.username??"",password:database.connections?.postgres?.password??"",port:database.connections?.postgres?.port??5432}}return{database:":memory:"}}export const QB_SNAPSHOT_DIR="storage/framework/database",RAW_QUERY_SOFT_DELETE_CONFIG={enabled:!1,column:"deleted_at",defaultFilter:!0};export function createDatabaseQueryHooks(dispatch){function forward(event){try{Promise.resolve(dispatch(event)).catch(()=>{})}catch{}}return{onQueryEnd:(event)=>forward({query:{sql:event.sql,parameters:event.params},queryDurationMillis:event.durationMs}),onQueryError:(event)=>forward({query:{sql:event.sql,parameters:event.params},queryDurationMillis:event.durationMs,error:event.error})}}function forwardDatabaseQuery(event){import("./query-logger").then(({logQuery})=>logQuery(event)).catch(()=>{})}registerPersistentQueryHooks(createDatabaseQueryHooks(forwardDatabaseQuery));function getPoolConfig(){const driver=getDriver();if(driver==="sqlite")return;return getDatabaseConfig().connections?.[driver]?.pool}function getReplicas(){const driver=getDriver();if(driver==="sqlite")return[];return getDatabaseConfig().connections?.[driver]?.replicas??[]}function getReadPolicy(){return getDatabaseConfig().reads??{}}function toBunPoolOptions(pool){if(!pool)return{};const options={};if(pool.max!==void 0)options.max=pool.max;if(pool.idleTimeoutMs!==void 0)options.idleTimeout=Math.round(pool.idleTimeoutMs/1000);if(pool.acquireTimeoutMs!==void 0)options.connectionTimeout=Math.round(pool.acquireTimeoutMs/1000);if(pool.maxLifetimeMs!==void 0)options.maxLifetime=Math.round(pool.maxLifetimeMs/1000);return options}function updateQueryBuilderConfig(){const dialect=getDialect(),dbConfigForQb=getDbConfig(),pool=getPoolConfig();setConfig({dialect,vitess:{sharded:isVitessSharded(dbConfig.connections.vitess?.sharded)},database:pool?{...dbConfigForQb,pool}:dbConfigForQb,verbose:getEnv()!=="production",snapshotDir:QB_SNAPSHOT_DIR,migrationDir:relativeMigrationDirectory(resolveMigrationDirectory(toQueryBuilderDialect(dialect),{snapshotDir:QB_SNAPSHOT_DIR})),timestamps:{createdAt:"created_at",updatedAt:"updated_at",defaultOrderColumn:"created_at"},softDeletes:RAW_QUERY_SOFT_DELETE_CONFIG})}updateQueryBuilderConfig();let _dbInstance=null,_configInitPromise=null;function ensureConfigLoaded(){if(!_configInitPromise)_configInitPromise=(async()=>{try{const{config,overridesReady}=await import("@stacksjs/config");await overridesReady;if(config){initializeDbConfig(config);_dbInstance=null}}catch{}})();return _configInitPromise}export async function ensureDatabaseConfigLoaded(){await ensureConfigLoaded()}export{applySqlitePragmas,SQLITE_BOOTSTRAP_PRAGMAS}from"@stacksjs/query-builder";const sqliteTxOwner=new AsyncLocalStorage;let sqliteTxTail=Promise.resolve();function serializeSqliteTransaction(run){if(sqliteTxOwner.getStore())return run();const result=sqliteTxTail.then(()=>sqliteTxOwner.run(!0,run));sqliteTxTail=result.then(()=>{return},()=>{return});return result}function applySqliteTransactionSerialization(instance){const original=instance.transaction.bind(instance);instance.transaction=(...args)=>serializeSqliteTransaction(()=>original(...args))}function applyTransactionRoutingContext(instance){const original=instance.transaction.bind(instance);instance.transaction=(...args)=>withTransactionContext(()=>original(...args))}function getDb(){if(!_dbInstance){updateQueryBuilderConfig();_dbInstance=createQueryBuilder();if(getDialect()==="sqlite")applySqliteTransactionSerialization(_dbInstance);applyTransactionRoutingContext(_dbInstance)}return _dbInstance}let _replicaInstances=new Map;export function resetDatabaseConnection(){resetQueryBuilderConnection();_dbInstance=null;_replicaInstances=new Map}function getReplicaDb(replica){const primary=getDbConfig(),resolved=resolveReplicaConnection(replica,primary),key=`${resolved.host}:${resolved.port??""}`,cached=_replicaInstances.get(key);if(cached)return cached;const scheme=isMysqlWire(getDriver())?"mysql":"postgres",auth=resolved.username?`${encodeURIComponent(resolved.username)}:${encodeURIComponent(resolved.password??"")}@`:"",url=`${scheme}://${auth}${resolved.host}:${resolved.port}/${resolved.database}`,sql=new SQL({url,...toBunPoolOptions(getPoolConfig())}),instance=createQueryBuilder({sql});_replicaInstances.set(key,instance);return instance}function getReadDb(){const replicas=getReplicas(),policy=getReadPolicy();if(!shouldRouteToReplica({policy,replicas}))return getDb();const replica=selectReplica(replicas,policy.strategy);return replica?getReplicaDb(replica):getDb()}function getExplicitReadDb(){const replicas=getReplicas();if(!replicas.length||contextInTransaction())return getDb();const replica=selectReplica(replicas,getReadPolicy().strategy);return replica?getReplicaDb(replica):getDb()}const WRITE_ENTRY_POINTS=new Set(["insertInto","updateTable","deleteFrom","create","createMany","insertOrIgnore","insertGetId","updateOrInsert","upsert"]),READ_ENTRY_POINTS=new Set(["selectFrom","selectFromSub","select"]);ensureConfigLoaded();export const db=new Proxy({},{get(_target,prop){if(prop==="fn")return aggregateFunctions;if(prop==="read")return readDb;if(typeof prop==="string"&&WRITE_ENTRY_POINTS.has(prop))markContextWrote();const instance=typeof prop==="string"&&READ_ENTRY_POINTS.has(prop)?getReadDb():getDb(),value=instance[prop];if(typeof value==="function")return value.bind(instance);return value}}),readDb=new Proxy({},{get(_target,prop){if(prop==="fn")return aggregateFunctions;const instance=getExplicitReadDb(),value=instance[prop];if(typeof value==="function")return value.bind(instance);return value}});export{setConfig};
+import{AsyncLocalStorage}from"node:async_hooks";import{createQueryBuilder,registerPersistentQueryHooks,resetConnection as resetQueryBuilderConnection,setConfig}from"@stacksjs/query-builder";import{SQL}from"bun";import{env as envVars}from"@stacksjs/env";import{getConnectionDefaults}from"./defaults";import{isMysqlWire,isVitessSharded,toQueryBuilderDialect}from"./dialect";import{relativeMigrationDirectory,resolveMigrationDirectory}from"./migration-path";import{contextInTransaction,markContextWrote,resolveReplicaConnection,selectReplica,shouldRouteToReplica,withTransactionContext}from"./replicas";import{aggregateFunctions}from"./types";const sqliteDefaults=getConnectionDefaults("sqlite",envVars),mysqlDefaults=getConnectionDefaults("mysql",envVars),postgresDefaults=getConnectionDefaults("postgres",envVars);let appEnv=envVars.APP_ENV||"local",dbDriver=envVars.DB_CONNECTION||"sqlite",dbConfig={connections:{sqlite:{database:sqliteDefaults.database,prefix:""},mysql:{name:mysqlDefaults.database,host:mysqlDefaults.host,username:mysqlDefaults.username,password:mysqlDefaults.password,port:mysqlDefaults.port,prefix:""},singlestore:{name:mysqlDefaults.database,host:mysqlDefaults.host,username:mysqlDefaults.username,password:mysqlDefaults.password,port:mysqlDefaults.port,prefix:""},vitess:{name:mysqlDefaults.database,host:mysqlDefaults.host,username:mysqlDefaults.username,password:mysqlDefaults.password,port:15306,prefix:"",sharded:isVitessSharded()},postgres:{name:postgresDefaults.database,host:postgresDefaults.host,username:postgresDefaults.username,password:postgresDefaults.password,port:postgresDefaults.port,prefix:""}}},dbConfigLockTail=Promise.resolve();export function acquireDbConfigLock(){let release=()=>{};const held=new Promise((resolve)=>{release=resolve}),acquired=dbConfigLockTail.then(()=>release);dbConfigLockTail=dbConfigLockTail.then(()=>held);return acquired}export function initializeDbConfig(config){if(config?.app?.env)appEnv=config.app.env;if(config?.database?.default)dbDriver=config.database.default;if(config?.database)dbConfig=config.database;updateQueryBuilderConfig();_dbInstance=null;_replicaInstances=new Map}function getEnv(){return appEnv}function getDriver(){return dbDriver}function getDatabaseConfig(){return dbConfig}function getDialect(){return toQueryBuilderDialect(getDriver())}function getDbConfig(){const driver=getDriver(),database=getDatabaseConfig(),env=getEnv();if(driver==="sqlite"){const defaultName=env!=="testing"?"database/stacks.sqlite":"database/stacks_testing.sqlite";return{database:database.connections?.sqlite?.database??defaultName}}if(driver==="mysql")return{database:database.connections?.mysql?.name||"stacks",host:database.connections?.mysql?.host??"127.0.0.1",username:database.connections?.mysql?.username??"root",password:database.connections?.mysql?.password??"",port:database.connections?.mysql?.port??3306};if(driver==="singlestore")return{database:database.connections?.singlestore?.name||"stacks",host:database.connections?.singlestore?.host??"127.0.0.1",username:database.connections?.singlestore?.username??"root",password:database.connections?.singlestore?.password??"",port:database.connections?.singlestore?.port??3306};if(driver==="vitess")return{database:database.connections?.vitess?.name||"stacks",host:database.connections?.vitess?.host??"127.0.0.1",username:database.connections?.vitess?.username??"root",password:database.connections?.vitess?.password??"",port:database.connections?.vitess?.port??15306};if(driver==="postgres"){const dbName=database.connections?.postgres?.name??"stacks";return{database:env==="testing"?`${dbName}_testing`:dbName,host:database.connections?.postgres?.host??"127.0.0.1",username:database.connections?.postgres?.username??"",password:database.connections?.postgres?.password??"",port:database.connections?.postgres?.port??5432}}return{database:":memory:"}}export const QB_SNAPSHOT_DIR="storage/framework/database",RAW_QUERY_SOFT_DELETE_CONFIG={enabled:!1,column:"deleted_at",defaultFilter:!0};export function createDatabaseQueryHooks(dispatch){function forward(event){try{Promise.resolve(dispatch(event)).catch(()=>{})}catch{}}return{onQueryEnd:(event)=>forward({query:{sql:event.sql,parameters:event.params},queryDurationMillis:event.durationMs}),onQueryError:(event)=>forward({query:{sql:event.sql,parameters:event.params},queryDurationMillis:event.durationMs,error:event.error})}}function forwardDatabaseQuery(event){import("./query-logger").then(({logQuery})=>logQuery(event)).catch(()=>{})}registerPersistentQueryHooks(createDatabaseQueryHooks(forwardDatabaseQuery));function getPoolConfig(){const driver=getDriver();if(driver==="sqlite")return;return getDatabaseConfig().connections?.[driver]?.pool}function getReplicas(){const driver=getDriver();if(driver==="sqlite")return[];return getDatabaseConfig().connections?.[driver]?.replicas??[]}function getReadPolicy(){return getDatabaseConfig().reads??{}}function toBunPoolOptions(pool){if(!pool)return{};const options={};if(pool.max!==void 0)options.max=pool.max;if(pool.idleTimeoutMs!==void 0)options.idleTimeout=Math.round(pool.idleTimeoutMs/1000);if(pool.acquireTimeoutMs!==void 0)options.connectionTimeout=Math.round(pool.acquireTimeoutMs/1000);if(pool.maxLifetimeMs!==void 0)options.maxLifetime=Math.round(pool.maxLifetimeMs/1000);return options}function updateQueryBuilderConfig(){const dialect=getDialect(),dbConfigForQb=getDbConfig(),pool=getPoolConfig();setConfig({dialect,vitess:{sharded:isVitessSharded(dbConfig.connections.vitess?.sharded)},database:pool?{...dbConfigForQb,pool}:dbConfigForQb,verbose:getEnv()!=="production",snapshotDir:QB_SNAPSHOT_DIR,migrationDir:relativeMigrationDirectory(resolveMigrationDirectory(toQueryBuilderDialect(dialect),{snapshotDir:QB_SNAPSHOT_DIR})),timestamps:{createdAt:"created_at",updatedAt:"updated_at",defaultOrderColumn:"created_at"},softDeletes:RAW_QUERY_SOFT_DELETE_CONFIG})}updateQueryBuilderConfig();let _dbInstance=null,_configInitPromise=null;function ensureConfigLoaded(){if(!_configInitPromise)_configInitPromise=(async()=>{try{const{config,overridesReady}=await import("@stacksjs/config");await overridesReady;if(config){initializeDbConfig(config);_dbInstance=null}}catch{}})();return _configInitPromise}export async function ensureDatabaseConfigLoaded(){await ensureConfigLoaded()}export{applySqlitePragmas,SQLITE_BOOTSTRAP_PRAGMAS}from"@stacksjs/query-builder";const sqliteTxOwner=new AsyncLocalStorage;let sqliteTxTail=Promise.resolve();function serializeSqliteTransaction(run){if(sqliteTxOwner.getStore())return run();const result=sqliteTxTail.then(()=>sqliteTxOwner.run(!0,run));sqliteTxTail=result.then(()=>{return},()=>{return});return result}function applySqliteTransactionSerialization(instance){const original=instance.transaction.bind(instance);instance.transaction=(...args)=>serializeSqliteTransaction(()=>original(...args))}function applyTransactionRoutingContext(instance){const original=instance.transaction.bind(instance);instance.transaction=(...args)=>withTransactionContext(()=>original(...args))}function getDb(){if(!_dbInstance){updateQueryBuilderConfig();_dbInstance=createQueryBuilder();if(getDialect()==="sqlite")applySqliteTransactionSerialization(_dbInstance);applyTransactionRoutingContext(_dbInstance)}return _dbInstance}let _replicaInstances=new Map;export function resetDatabaseConnection(){resetQueryBuilderConnection();_dbInstance=null;_replicaInstances=new Map}function getReplicaDb(replica){const primary=getDbConfig(),resolved=resolveReplicaConnection(replica,primary),key=`${resolved.host}:${resolved.port??""}`,cached=_replicaInstances.get(key);if(cached)return cached;const scheme=isMysqlWire(getDriver())?"mysql":"postgres",auth=resolved.username?`${encodeURIComponent(resolved.username)}:${encodeURIComponent(resolved.password??"")}@`:"",url=`${scheme}://${auth}${resolved.host}:${resolved.port}/${resolved.database}`,sql=new SQL({url,...toBunPoolOptions(getPoolConfig())}),instance=createQueryBuilder({sql});_replicaInstances.set(key,instance);return instance}function getReadDb(){const replicas=getReplicas(),policy=getReadPolicy();if(!shouldRouteToReplica({policy,replicas}))return getDb();const replica=selectReplica(replicas,policy.strategy);return replica?getReplicaDb(replica):getDb()}function getExplicitReadDb(){const replicas=getReplicas();if(!replicas.length||contextInTransaction())return getDb();const replica=selectReplica(replicas,getReadPolicy().strategy);return replica?getReplicaDb(replica):getDb()}const WRITE_ENTRY_POINTS=new Set(["insertInto","updateTable","deleteFrom","create","createMany","insertOrIgnore","insertGetId","updateOrInsert","upsert"]),READ_ENTRY_POINTS=new Set(["selectFrom","selectFromSub","select"]);ensureConfigLoaded();export function asRows(rows){return rows}export function asRow(row){return row}export const db=new Proxy({},{get(_target,prop){if(prop==="fn")return aggregateFunctions;if(prop==="read")return readDb;if(typeof prop==="string"&&WRITE_ENTRY_POINTS.has(prop))markContextWrote();const instance=typeof prop==="string"&&READ_ENTRY_POINTS.has(prop)?getReadDb():getDb(),value=instance[prop];if(typeof value==="function")return value.bind(instance);return value}}),readDb=new Proxy({},{get(_target,prop){if(prop==="fn")return aggregateFunctions;const instance=getExplicitReadDb(),value=instance[prop];if(typeof value==="function")return value.bind(instance);return value}});export{setConfig};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.72.22",
+  "version": "0.72.24",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -65,15 +65,15 @@
     "dynamodb-tooling": "^0.3.2"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.72.22",
-    "@stacksjs/config": "0.72.22",
-    "@stacksjs/logging": "0.72.22",
-    "@stacksjs/router": "0.72.22",
+    "@stacksjs/cli": "0.72.24",
+    "@stacksjs/config": "0.72.24",
+    "@stacksjs/logging": "0.72.24",
+    "@stacksjs/router": "0.72.24",
     "better-dx": "^0.2.23",
-    "@stacksjs/path": "0.72.22",
-    "@stacksjs/query-builder": "0.72.22",
-    "@stacksjs/storage": "0.72.22",
-    "@stacksjs/strings": "0.72.22",
-    "@stacksjs/utils": "0.72.22"
+    "@stacksjs/path": "0.72.24",
+    "@stacksjs/query-builder": "0.72.24",
+    "@stacksjs/storage": "0.72.24",
+    "@stacksjs/strings": "0.72.24",
+    "@stacksjs/utils": "0.72.24"
   }
 }