@bakery-framework/orm 2.4.2 → 2.5.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakery-framework/orm",
-  "version": "2.4.2",
+  "version": "2.5.0-alpha.1",
   "description": "Bakery database layer: adapters, query builder, schema sync and backup.",
   "keywords": [
     "bakery",
@@ -53,9 +53,9 @@
     "!src/tests"
   ],
   "engines": {
-    "bun": ">=1.4.0"
+    "bun": ">=1.4.4"
   },
   "dependencies": {
-    "@bakery-framework/core": "^2.4.2"
+    "@bakery-framework/core": "^2.5.0-alpha.1"
   }
 }

package/src/adapters/base.ts

@@ -360,7 +360,9 @@ export function createExecutor(
   } = {},
 ): SQLAdapter.Executor {
   const bind = options.bind ?? refuseArrays(driver)
-  const bound = <F extends SQLAdapter.Executor['all'] | SQLAdapter.Executor['run']>(
+  const bound = <
+    F extends SQLAdapter.Executor['all'] | SQLAdapter.Executor['run'],
+  >(
     fn: F,
   ): F =>
     (async (sqlText: string, params: unknown[] = []) =>
@@ -1527,7 +1529,6 @@ function parseCSVValue(val: any, type?: string): any {
   return parseCSVValueFallback(trimmed)
 }
 
-// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: csv
 function parseCSVRows(csv: string): string[][] {
   const result: string[][] = []
   let row: string[] = []

package/src/adapters/sqlite.ts

@@ -243,7 +243,9 @@ export class SQLiteAdapter extends SQLAdapter {
 
     const fell = await this.sql.unsafe('PRAGMA journal_mode = DELETE;')
     const mode = Array.isArray(fell)
-      ? String((fell[0] as { journal_mode?: unknown })?.journal_mode ?? 'unknown')
+      ? String(
+          (fell[0] as { journal_mode?: unknown })?.journal_mode ?? 'unknown',
+        )
       : 'unknown'
     MESSAGES.JOURNAL_WAL_REFUSED({
       file: filename,
@@ -268,9 +270,7 @@ export class SQLiteAdapter extends SQLAdapter {
    */
   override async schemaFingerprint(): Promise<string | null> {
     const row = (await this.query('PRAGMA schema_version').get()) as
-      | { schema_version?: number }
-      | null
-      | undefined
+      { schema_version?: number } | null | undefined
     const version = row?.schema_version
     if (typeof version !== 'number') return null
     return `sqlite:${this.filename ?? ''}:${version}`

package/src/field.ts

@@ -52,10 +52,7 @@ type ArrayElement =
 
 /** What Bun returns for one element of an array of `E`. */
 type ElementOf<E extends ArrayElement> = E extends
-  | 'integer'
-  | 'smallint'
-  | 'real'
-  | 'double precision'
+  'integer' | 'smallint' | 'real' | 'double precision'
   ? number
   : E extends 'boolean'
     ? boolean
@@ -379,7 +376,10 @@ export const Field = {
     element: E,
     options: { nullable?: true; optional?: true } = {},
   ) => {
-    const def: Record<string, unknown> = { type: 'sql', sqlType: `${element}[]` }
+    const def: Record<string, unknown> = {
+      type: 'sql',
+      sqlType: `${element}[]`,
+    }
     if (options.nullable) def.nullable = true
     return def
   }) as {
@@ -492,8 +492,7 @@ export const Field = {
             // The options object, when present, is the only non-column argument.
             const actions =
               (args.find(a => a && !isColumnValue(a)) as
-                | ForeignKeyActions
-                | undefined) ?? {}
+                ForeignKeyActions | undefined) ?? {}
 
             if (!targets.length)
               throws(

package/src/index.ts

@@ -61,9 +61,5 @@ export type {
   ExtractViews,
   TableDef,
 } from './schema-util'
-export {
-  col,
-  dateNow,
-  old,
-} from './schema-util'
+export { col, dateNow, old } from './schema-util'
 export { DB, Mutation }

package/src/migrate/files.ts

@@ -33,8 +33,7 @@ const MIGRATION_NAME = /^(\d+)_[A-Za-z0-9._-]+\.sql$/
 const NO_TRANSACTION = /^--\s*bakery:\s*no-transaction\s*$/i
 
 export type ReadResult =
-  | { ok: true; files: MigrationFile[] }
-  | { ok: false; problems: string[] }
+  { ok: true; files: MigrationFile[] } | { ok: false; problems: string[] }
 
 /**
  * Every migration in `dir`, in the order they run.

package/src/orm/index.ts

@@ -11,11 +11,11 @@
  * initializing, and the whole ORM dies with
  * `TypeError: undefined is not an object (evaluating 'Mutation.Insert')`.
  *
- * Biome's `organizeImports` sorts these alphabetically and puts `./mutation`
- * first. The compiler cannot see the breakage, because the types are fine
- * either way. Hence the suppression.
+ * Sorting these imports alphabetically, as Biome's `organizeImports` did while
+ * the repo ran Biome, puts `./mutation` first. The compiler cannot see the
+ * breakage, because the types are fine either way, so no import sorter may
+ * run on this file.
  */
-// biome-ignore-all assist/source/organizeImports: cycle. See above
 import { DB } from './query'
 import { Mutation } from './mutation'
 

package/src/orm/mutation.ts

@@ -63,9 +63,8 @@ export namespace Mutation {
     : string
 
   export type QualifiedColumnTarget<T extends Tables> = T extends keyof DBSchema
-    ?
-        | `${Extract<T, string>}.${Extract<keyof DBSchema[T], string>}`
-        | ColumnTarget<T>
+    ? | `${Extract<T, string>}.${Extract<keyof DBSchema[T], string>}`
+      | ColumnTarget<T>
     : string
 
   /**

package/src/orm/query.ts

@@ -2,7 +2,19 @@ import { Case } from '@bakery-framework/core/utils'
 import { throws } from '@bakery-framework/core/utils/common'
 import { getActiveDb, txStorage } from '../connection'
 import type { AppDBSchema as DBSchema } from '../schema-registry'
-import { ColumnRef as schemaColumnRef, OperatorRef as schemaOperatorRef, SQLFunctionRef as schemaSQLFunctionRef, SQL_FUNCTIONS, WindowRef as schemaWindowRef, col as schemaCol, evalOperands, isSafeIdentifier, nullComparison, qId, qRaw } from '../schema-util'
+import {
+  ColumnRef as schemaColumnRef,
+  OperatorRef as schemaOperatorRef,
+  SQLFunctionRef as schemaSQLFunctionRef,
+  SQL_FUNCTIONS,
+  WindowRef as schemaWindowRef,
+  col as schemaCol,
+  evalOperands,
+  isSafeIdentifier,
+  nullComparison,
+  qId,
+  qRaw,
+} from '../schema-util'
 import { Mutation } from './mutation'
 import { ArrayValue } from '../array-value'
 
@@ -128,7 +140,9 @@ export namespace DB {
    * so every call site got this answer anyway: it only misled the reader.
    */
   export type AllTableColumns = {
-    [T in keyof DBSchema]: `${T & string}.${Extract<keyof DBSchema[T] & string, string>}`
+    [
+      T in keyof DBSchema
+    ]: `${T & string}.${Extract<keyof DBSchema[T] & string, string>}`
   }[keyof DBSchema]
 
   export type WhereValue<C extends string> =
@@ -143,10 +157,7 @@ export namespace DB {
     | null
 
   export type WhereColumn<S extends TableSchemas, J extends string> =
-    | ColumnString<S, J>
-    | SQLFunctionRef<ColumnString<S, J>>
-    | QBRaw
-    | QBObject
+    ColumnString<S, J> | SQLFunctionRef<ColumnString<S, J>> | QBRaw | QBObject
 
   export type ResolveColumnString<
     S,
@@ -610,8 +621,11 @@ export namespace DB {
     C extends `${infer Table}.${infer _Col}` ? Table : C
 
   // Stage Interfaces for Method Ordering
-  export interface IQBTable<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBTable<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     join<R extends AllTableColumns, A extends string | undefined = undefined>(
       leftCol: ColumnString<S, J>,
       rightCol: R,
@@ -690,7 +704,9 @@ export namespace DB {
     select<
       C extends SelectColumns<S, J>,
       P2 extends TakeSelectValues<S, C> = TakeSelectValues<S, C>,
-    >(columns: C): IQBSelect<S, J, P2>
+    >(
+      columns: C,
+    ): IQBSelect<S, J, P2>
     selectAll<A extends Extract<J, string>>(
       alias?: A,
     ): IQBSelect<
@@ -721,8 +737,11 @@ export namespace DB {
     ): IQBLimit<S, J, P>
   }
 
-  export interface IQBWhere<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBWhere<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     and(
       column: WhereColumn<S, J>,
       valueOrRef?: WhereValue<ColumnString<S, J>>,
@@ -736,7 +755,9 @@ export namespace DB {
     select<
       C extends SelectColumns<S, J>,
       P2 extends TakeSelectValues<S, C> = TakeSelectValues<S, C>,
-    >(columns: C): IQBSelect<S, J, P2>
+    >(
+      columns: C,
+    ): IQBSelect<S, J, P2>
     selectAll<A extends Extract<J, string>>(
       alias?: A,
     ): IQBSelect<
@@ -761,12 +782,17 @@ export namespace DB {
     ): IQBLimit<S, J, P>
   }
 
-  export interface IQBGroupBy<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBGroupBy<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     select<
       C extends SelectColumns<S, J>,
       P2 extends TakeSelectValues<S, C> = TakeSelectValues<S, C>,
-    >(columns: C): IQBSelect<S, J, P2>
+    >(
+      columns: C,
+    ): IQBSelect<S, J, P2>
     selectAll<A extends Extract<J, string>>(
       alias?: A,
     ): IQBSelect<
@@ -789,8 +815,11 @@ export namespace DB {
     distinct(): this
   }
 
-  export interface IQBHaving<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBHaving<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     andHaving(
       column: WhereColumn<S, J>,
       valueOrRef?: WhereValue<ColumnString<S, J>>,
@@ -816,8 +845,11 @@ export namespace DB {
     ): IQBLimit<S, J, P>
   }
 
-  export interface IQBSelect<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBSelect<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     /**
      * Grouping after selecting, which always worked at runtime (clauses are
      * assembled at `parse()`, so call order is irrelevant), and was simply
@@ -829,7 +861,9 @@ export namespace DB {
     select<
       C extends SelectColumns<S, J>,
       P2 extends TakeSelectValues<S, C> = TakeSelectValues<S, C>,
-    >(columns: C): IQBSelect<S, J, P & P2>
+    >(
+      columns: C,
+    ): IQBSelect<S, J, P & P2>
     selectAll<A extends Extract<J, string>>(
       alias?: A,
     ): IQBSelect<
@@ -877,8 +911,11 @@ export namespace DB {
     ): IQBLimit<S, J, P>
   }
 
-  export interface IQBOrderBy<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBOrderBy<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     orderBy(
       colStr: keyof P | ColumnString<S, J>,
       direction?: 'ASC' | 'DESC',
@@ -896,8 +933,11 @@ export namespace DB {
     ): IQBLimit<S, J, P>
   }
 
-  export interface IQBLimit<S extends TableSchemas, J extends string, P = any>
-    extends QBObject<P> {
+  export interface IQBLimit<
+    S extends TableSchemas,
+    J extends string,
+    P = any,
+  > extends QBObject<P> {
     /** `SELECT DISTINCT`. See the runtime method for the semantics. */
     distinct(): this
     limit(count: number, offset?: number): IQBLimit<S, J, P>
@@ -1120,10 +1160,10 @@ export namespace DB {
   }
 
   export class QB<
-      S extends TableSchemas = DBSchema,
-      J extends string = never,
-      P = any,
-    >
+    S extends TableSchemas = DBSchema,
+    J extends string = never,
+    P = any,
+  >
     extends QBObject<P>
     implements
       IQBTable<S, J, P>,
@@ -1504,7 +1544,6 @@ export namespace DB {
     // The numbered sections below are the statement grammar. Parameter push order
     // is load-bearing (Postgres renumbers `?` to `$n` left to right), so the
     // sequence is the correctness condition, not incidental.
-    // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: SQL assembler, one section per clause, in emission order
     parse(): { sql: string; params: any[] } {
       const params: any[] = []
 

package/src/schema-registry.ts

@@ -41,11 +41,10 @@ import type { MapOf } from '@bakery-framework/core/types'
 // app's `declare module '@bakery-framework/orm/schema-registry'` into
 // `TS2300: Duplicate identifier` and the whole schema registry stops working.
 //
-// Biome's `noBannedTypes` proposes exactly that rewrite and calls it a safe
-// fix. That rule is off repo-wide now, but `noEmptyInterface` reaches the same
-// construct and offers the same fix, so the suppression stays. The compiler is
-// the real guard: change this line and `apps/starter` fails to typecheck.
-// biome-ignore lint/suspicious/noEmptyInterface: must stay mergeable, above
+// Linters propose exactly that rewrite and call it a safe fix: Biome's
+// `noBannedTypes` and `noEmptyInterface` both did while the repo ran Biome.
+// The compiler is the real guard: change this line and `apps/starter` fails
+// to typecheck.
 export interface SchemaRegistry {}
 
 type Registered = SchemaRegistry extends { schema: infer S } ? S : never

package/src/schema-util.ts

@@ -281,7 +281,6 @@ export class OperatorRef<R = any> {
 
 // Convention 8 makes this the single writer of SQL identifiers, so the arms
 // belong together: splitting by operand kind spreads that responsibility.
-// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: recursive operand evaluator, one arm per operand shape
 export function evalOperands(
   where: unknown,
   params: unknown[],

package/src/sync/builder.ts

@@ -269,7 +269,6 @@ export class SchemaBuilder {
    * and are not introspected, so the database cannot tell us an enum from a
    * `VARCHAR`, and guessing would silently invent a constraint.
    */
-  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: decision table: column constraints to a Field.* call
   private static asFieldCall(
     cons: any,
     def: string | undefined,

package/src/sync/engine.ts

@@ -14,7 +14,7 @@ import { buildSyncPlan, calculateIndexDiff, logPlannedChanges } from './plan'
 import type * as SyncTypes from './types'
 
 // prettier-ignore
-export const syncMsgs = {
+const syncMsgs = {
   GEN_TYPES: 'I Generating types...',
   // Counted rather than silently dropped: a composite key is not a property of
   // one column, so the generator cannot spell it, but a reader who is not told
@@ -210,20 +210,20 @@ export class SyncEngine {
     // lands in `tablesToDrop`, which is still dangerous.
     const isDangerous = Boolean(
       plan.tablesToDrop.length ||
-        plan.tablesToRename.length ||
-        plan.columnsToDrop.length ||
-        plan.columnsToRename.length ||
-        plan.tablesToRebuild.size ||
-        indexesToDrop.size,
+      plan.tablesToRename.length ||
+      plan.columnsToDrop.length ||
+      plan.columnsToRename.length ||
+      plan.tablesToRebuild.size ||
+      indexesToDrop.size,
     )
 
     const hasChanges = Boolean(
       isDangerous ||
-        plan.unmappedTsTables.size ||
-        plan.columnsToAdd.length ||
-        plan.viewsToUpdate.length ||
-        indexesToDrop.size ||
-        indexesToAdd.size,
+      plan.unmappedTsTables.size ||
+      plan.columnsToAdd.length ||
+      plan.viewsToUpdate.length ||
+      indexesToDrop.size ||
+      indexesToAdd.size,
     )
 
     return { isDangerous, hasChanges }

package/src/sync/execute.ts

@@ -378,8 +378,7 @@ export function hasOldWrappers(constraints: SyncTypes.DBConstraints) {
     // `undefined`, which is what this check wants, so the narrowing is
     // deliberate rather than a lie, and the emitted code is unchanged.
     const cols = Object.values(tObj) as (
-      | SyncTypes.ColumnConstraint
-      | undefined
+      SyncTypes.ColumnConstraint | undefined
     )[]
     return cols.some(c => c?._oldColumn || c?._transform)
   })

package/src/sync/load.ts

@@ -156,7 +156,8 @@ async function readSchema(
   const [error, module] = await importFresh(entry)
   // Still read as no schema, which `loadSchema` relies on for a broken folder
   // entry, but no longer in silence: this is the only place the cause exists.
-  if (error) MESSAGES.SCHEMA_IMPORT_FAILED({ file: entry, error: error.message })
+  if (error)
+    MESSAGES.SCHEMA_IMPORT_FAILED({ file: entry, error: error.message })
   if (error || !module) return emptyAt(targetPath)
 
   if (layout === 'folder') {

package/src/sync/types.ts

@@ -89,11 +89,7 @@ export interface IndexConstraint {
  * against `c` and drop-and-recreate the key on every sync.
  */
 export type ForeignKeyAction =
-  | 'NO ACTION'
-  | 'RESTRICT'
-  | 'CASCADE'
-  | 'SET NULL'
-  | 'SET DEFAULT'
+  'NO ACTION' | 'RESTRICT' | 'CASCADE' | 'SET NULL' | 'SET DEFAULT'
 
 /**
  * A foreign key as the database reports it.