@open-mercato/shared 0.5.1-develop.2691.d8a0934b37 → 0.5.1-develop.2699.f8b50c8046

package/src/lib/api/__tests__/crud.test.ts

@@ -203,14 +203,16 @@ describe('findOneScoped', () => {
 describe('softDelete', () => {
   it('sets deletedAt and persists the updated entity', async () => {
     const entity = new ExampleEntity()
-    const persistAndFlush = jest.fn(async () => undefined)
-    const em = { persistAndFlush } as unknown as EntityManager
+    const flush = jest.fn(async () => undefined)
+    const persist = jest.fn((_entity: ExampleEntity) => ({ flush }))
+    const em = { persist } as unknown as EntityManager
     const before = Date.now()
 
     await softDelete(em, entity)
 
     expect(entity.deletedAt).toBeInstanceOf(Date)
     expect((entity.deletedAt as Date).getTime()).toBeGreaterThanOrEqual(before)
-    expect(persistAndFlush).toHaveBeenCalledWith(entity)
+    expect(persist).toHaveBeenCalledWith(entity)
+    expect(flush).toHaveBeenCalled()
   })
 })

package/src/lib/api/crud.ts

@@ -57,5 +57,5 @@ export async function softDelete<T extends { deletedAt?: Date | null }>(
   entity: T
 ): Promise<void> {
   ;(entity as any).deletedAt = new Date()
-  await em.persistAndFlush(entity)
+  await em.persist(entity).flush()
 }

package/src/lib/auth/__tests__/server.apiKeyCache.test.ts

@@ -5,7 +5,8 @@ const createRequestContainer = jest.fn()
 const findApiKeyBySecret = jest.fn()
 const emFind = jest.fn()
 const emFindOne = jest.fn()
-const emPersistAndFlush = jest.fn()
+const emPersist = jest.fn()
+const emFlush = jest.fn()
 
 jest.mock('next/headers', () => ({
   cookies: async () => ({ get: () => undefined }),
@@ -41,7 +42,11 @@ jest.mock('@open-mercato/core/modules/directory/data/entities', () => ({
 const em = {
   find: (...args: unknown[]) => emFind(...args),
   findOne: (...args: unknown[]) => emFindOne(...args),
-  persistAndFlush: (...args: unknown[]) => emPersistAndFlush(...args),
+  persist: (...args: unknown[]) => {
+    emPersist(...args)
+    return { flush: (...flushArgs: unknown[]) => emFlush(...flushArgs) }
+  },
+  flush: (...args: unknown[]) => emFlush(...args),
 }
 
 describe('resolveApiKeyAuth caching + lastUsedAt debounce', () => {
@@ -52,7 +57,8 @@ describe('resolveApiKeyAuth caching + lastUsedAt debounce', () => {
     })
     emFind.mockResolvedValue([])
     emFindOne.mockResolvedValue(null)
-    emPersistAndFlush.mockResolvedValue(undefined)
+    emPersist.mockReturnValue(undefined)
+    emFlush.mockResolvedValue(undefined)
     const { resetSharedApiKeyAuthCacheForTests } = await import('@open-mercato/shared/lib/auth/apiKeyAuthCache')
     resetSharedApiKeyAuthCacheForTests()
   })
@@ -85,7 +91,7 @@ describe('resolveApiKeyAuth caching + lastUsedAt debounce', () => {
     expect(second).toEqual(first)
     expect(third).toEqual(first)
     expect(findApiKeyBySecret).toHaveBeenCalledTimes(1)
-    expect(emPersistAndFlush).toHaveBeenCalledTimes(1)
+    expect(emFlush).toHaveBeenCalledTimes(1)
   })
 
   it('caches negative lookups so invalid keys skip the bcrypt+DB path', async () => {

package/src/lib/auth/server.ts

@@ -150,7 +150,7 @@ async function resolveApiKeyAuth(secret: string): Promise<AuthContext> {
     if (cache.shouldWriteLastUsed(record.id)) {
       try {
         record.lastUsedAt = new Date()
-        await em.persistAndFlush(record)
+        await em.persist(record).flush()
       } catch {
         // best-effort update; ignore write failures
       }

package/src/lib/bootstrap/types.ts

@@ -5,9 +5,9 @@ import type { Module, ModuleDashboardWidgetEntry, ModuleInjectionWidgetEntry } f
 import type { ModuleInjectionTable } from '../../modules/widgets/injection'
 import type { SearchModuleConfig } from '../../modules/search'
 import type { AnalyticsModuleConfig } from '../../modules/analytics'
-import type { EntityClass, EntityClassGroup } from '@mikro-orm/core'
+import type { EntityClass, EntitySchema } from '@mikro-orm/core'
 
-export type OrmEntity = EntityClass<unknown> | EntityClassGroup<unknown>
+export type OrmEntity = EntityClass<unknown> | EntitySchema<unknown>
 
 export interface InjectionTableEntry {
   moduleId: string

package/src/lib/crud/__tests__/crud-factory.test.ts

@@ -22,7 +22,14 @@ let mockOrganizationScopeOverride: MockOrganizationScope | null
 
 const em = {
   create: (_cls: any, data: any) => ({ ...data, id: `id-${idSeq++}` }),
-  persistAndFlush: async (entity: Rec) => { db[entity.id] = { ...(db[entity.id] || {} as any), ...entity } },
+  persist(entity: Rec) {
+    db[entity.id] = { ...(db[entity.id] || {} as any), ...entity }
+    return { flush: async () => undefined }
+  },
+  remove(entity: Rec) {
+    delete db[entity.id]
+    return { flush: async () => undefined }
+  },
   findOne: async (_entity: any, where: any) => (em.getRepository(_entity).findOne(where) as any),
   getRepository: (_cls: any) => ({
     find: async (where: any) => Object.values(db).filter((r) => {
@@ -56,7 +63,10 @@ const em = {
           : r.organizationId === orgClause
       return matchesOrg && r.tenantId === where.tenantId
     }) || null,
-    removeAndFlush: async (entity: Rec) => { delete db[entity.id] },
+    remove(entity: Rec) {
+      delete db[entity.id]
+      return { flush: async () => undefined }
+    },
   }),
 }
 
@@ -68,22 +78,22 @@ const mockDataEngine = {
   __pendingSideEffects: [] as any[],
   createOrmEntity: jest.fn(async ({ entity, data }: any) => {
     const created = em.create(entity, data)
-    await em.persistAndFlush(created as any)
+    await em.persist(created as any).flush()
     return created
   }),
   updateOrmEntity: jest.fn(async ({ entity, where, apply }: any) => {
     const current = await (em.getRepository(entity).findOne(where) as any)
     if (!current) return null
     await apply(current)
-    await em.persistAndFlush(current)
+    await em.persist(current).flush()
     return current
   }),
   deleteOrmEntity: jest.fn(async ({ entity, where, soft, softDeleteField }: any) => {
     const repo = em.getRepository(entity)
     const current = await (repo.findOne(where) as any)
     if (!current) return null
-    if (soft !== false) { (current as any)[softDeleteField || 'deletedAt'] = new Date(); await em.persistAndFlush(current) }
-    else await repo.removeAndFlush(current)
+    if (soft !== false) { (current as any)[softDeleteField || 'deletedAt'] = new Date(); await em.persist(current).flush() }
+    else await repo.remove(current).flush()
     return current
   }),
   setCustomFields: jest.fn(async (args: any) => {
@@ -278,10 +288,10 @@ describe('CRUD Factory', () => {
 
     const first = em.create(Todo, { title: 'One', organizationId: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', tenantId: '123e4567-e89b-12d3-a456-426614174000' }) as Rec
     first.id = '550e8400-e29b-41d4-a716-446655440010'
-    await em.persistAndFlush(first)
+    await em.persist(first).flush()
     const second = em.create(Todo, { title: 'Two', organizationId: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', tenantId: '123e4567-e89b-12d3-a456-426614174000' }) as Rec
     second.id = '550e8400-e29b-41d4-a716-446655440011'
-    await em.persistAndFlush(second)
+    await em.persist(second).flush()
 
     const res = await fallbackRoute.GET(new Request(`http://x/api/example/todos?ids=${first.id}`))
     expect(res.status).toBe(200)
@@ -302,10 +312,10 @@ describe('CRUD Factory', () => {
 
     const mine = em.create(Todo, { title: 'Mine', organizationId: defaultOrganizationId, tenantId: defaultTenantId }) as Rec
     mine.id = '550e8400-e29b-41d4-a716-446655440020'
-    await em.persistAndFlush(mine)
+    await em.persist(mine).flush()
     const other = em.create(Todo, { title: 'Other', organizationId: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', tenantId: defaultTenantId }) as Rec
     other.id = '550e8400-e29b-41d4-a716-446655440021'
-    await em.persistAndFlush(other)
+    await em.persist(other).flush()
 
     const res = await fallbackRoute.GET(new Request('http://x/api/example/todos'))
     expect(res.status).toBe(200)
@@ -328,13 +338,13 @@ describe('CRUD Factory', () => {
 
     const mine = em.create(Todo, { title: 'Mine', organizationId: defaultOrganizationId, tenantId: defaultTenantId }) as Rec
     mine.id = '550e8400-e29b-41d4-a716-446655440030'
-    await em.persistAndFlush(mine)
+    await em.persist(mine).flush()
     const otherOrg = em.create(Todo, { title: 'OtherOrg', organizationId: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', tenantId: defaultTenantId }) as Rec
     otherOrg.id = '550e8400-e29b-41d4-a716-446655440031'
-    await em.persistAndFlush(otherOrg)
+    await em.persist(otherOrg).flush()
     const otherTenant = em.create(Todo, { title: 'OtherTenant', organizationId: defaultOrganizationId, tenantId: 'ffffffff-ffff-4fff-8fff-ffffffffffff' }) as Rec
     otherTenant.id = '550e8400-e29b-41d4-a716-446655440032'
-    await em.persistAndFlush(otherTenant)
+    await em.persist(otherTenant).flush()
 
     const res = await fallbackRoute.GET(new Request('http://x/api/example/todos'))
     expect(res.status).toBe(200)
@@ -433,7 +443,7 @@ describe('CRUD Factory', () => {
     const created = em.create(Todo, { title: 'X', organizationId: defaultOrganizationId, tenantId: defaultTenantId }) as Rec
     // Force UUID id to satisfy validation
     created.id = '123e4567-e89b-12d3-a456-426614174001'
-    await em.persistAndFlush(created)
+    await em.persist(created).flush()
     const res = await route.PUT(new Request('http://x/api/example/todos', { method: 'PUT', body: JSON.stringify({ id: created.id, title: 'X2', cf_priority: 5 }), headers: { 'content-type': 'application/json' } }))
     expect(res.status).toBe(200)
     expect(setRecordCustomFields).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ values: { priority: 5 } }))
@@ -450,7 +460,7 @@ describe('CRUD Factory', () => {
   it('DELETE soft-deletes entity and emits deleted event', async () => {
     const created = em.create(Todo, { title: 'Y', organizationId: defaultOrganizationId, tenantId: defaultTenantId }) as Rec
     created.id = '123e4567-e89b-12d3-a456-426614174002'
-    await em.persistAndFlush(created)
+    await em.persist(created).flush()
     const res = await route.DELETE(new Request(`http://x/api/example/todos?id=${created.id}`, { method: 'DELETE' }))
     expect(res.status).toBe(200)
     expect(mockDataEngine.emitOrmEntityEvent).toHaveBeenCalledTimes(1)
@@ -466,7 +476,7 @@ describe('CRUD Factory', () => {
   it('trims padded selected organization ids when scope resolution falls back from empty filter ids', async () => {
     const created = em.create(Todo, { title: 'Scoped', organizationId: defaultOrganizationId, tenantId: defaultTenantId }) as Rec
     created.id = '123e4567-e89b-12d3-a456-426614174052'
-    await em.persistAndFlush(created)
+    await em.persist(created).flush()
     mockOrganizationScopeOverride = {
       selectedId: ` ${defaultOrganizationId} `,
       filterIds: [],
@@ -518,7 +528,7 @@ describe('CRUD Factory', () => {
       tenantId: '123e4567-e89b-12d3-a456-426614174000',
     }) as Rec
     created.id = '123e4567-e89b-12d3-a456-426614174051'
-    await em.persistAndFlush(created)
+    await em.persist(created).flush()
 
     const res = await route.PUT(new Request('http://x/api/example/todos', {
       method: 'PUT',

package/src/lib/data/engine.ts

@@ -1,6 +1,7 @@
 import type { EntityData, EntityName, FilterQuery, RequiredEntityData } from '@mikro-orm/core'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AwilixContainer } from 'awilix'
+import { type Kysely, sql } from 'kysely'
 import { setRecordCustomFields } from '@open-mercato/core/modules/entities/lib/helpers'
 import { validateCustomFieldValuesServer } from '@open-mercato/core/modules/entities/lib/validation'
 import { sanitizeCustomFieldHtmlRichTextValuesServer } from '@open-mercato/core/modules/entities/lib/htmlRichTextSanitizer'
@@ -202,11 +203,17 @@ export class DefaultDataEngine implements DataEngine {
     } catch { return false }
   }
 
+  private getKysely(): Kysely<any> {
+    return this.em.getKysely<any>()
+  }
+
   private async ensureStorageTableExists(): Promise<void> {
-    const knex = this.em.getConnection().getKnex()
-    const exists = await knex('information_schema.tables')
-      .where({ table_name: 'custom_entities_storage' })
-      .first()
+    const db = this.getKysely()
+    const exists = await db
+      .selectFrom('information_schema.tables' as any)
+      .select(sql`1`.as('present'))
+      .where('table_name' as any, '=', 'custom_entities_storage')
+      .executeTakeFirst()
     if (!exists) {
       throw new Error('custom_entities_storage table is missing. Run migrations (yarn db:migrate).')
     }
@@ -247,7 +254,7 @@ export class DefaultDataEngine implements DataEngine {
   }
 
   async createCustomEntityRecord(opts: Parameters<DataEngine['createCustomEntityRecord']>[0]): Promise<{ id: string }> {
-    const knex = this.em.getConnection().getKnex()
+    const db = this.getKysely()
     await this.ensureStorageTableExists()
     const sanitizedValues = await sanitizeCustomFieldHtmlRichTextValuesServer(this.em, {
       entityId: opts.entityId,
@@ -274,31 +281,47 @@ export class DefaultDataEngine implements DataEngine {
     const tenantId = opts.tenantId ?? null
     const doc: Record<string, unknown> = { id, ...this.normalizeDocValues(sanitizedValues || {}) }
 
+    const now = sql`now()`
     const payload = {
       entity_type: opts.entityId,
       entity_id: id,
       organization_id: orgId,
       tenant_id: tenantId,
-      doc,
-      updated_at: knex.fn.now(),
-      created_at: knex.fn.now(),
+      doc: sql`${JSON.stringify(doc)}::jsonb`,
+      updated_at: now,
+      created_at: now,
       deleted_at: null,
     }
 
     // Upsert by scoped uniqueness
     try {
-      await knex('custom_entities_storage')
-        .insert(payload)
-        .onConflict(['entity_type', 'entity_id', 'organization_id'])
-        .merge({ doc: payload.doc, updated_at: knex.fn.now(), deleted_at: null })
+      await db
+        .insertInto('custom_entities_storage' as any)
+        .values(payload as any)
+        .onConflict((oc) => oc
+          .columns(['entity_type', 'entity_id', 'organization_id'])
+          .doUpdateSet({
+            doc: sql`${JSON.stringify(doc)}::jsonb`,
+            updated_at: sql`now()`,
+            deleted_at: null,
+          } as any))
+        .execute()
     } catch {
       // Fallback for global scope uniqueness
       try {
-        const updated = await knex('custom_entities_storage')
-          .where({ entity_type: opts.entityId, entity_id: id, organization_id: orgId })
-          .update({ doc: payload.doc, updated_at: knex.fn.now(), deleted_at: null })
-        if (!updated) {
-          await knex('custom_entities_storage').insert(payload)
+        const updated = await db
+          .updateTable('custom_entities_storage' as any)
+          .set({
+            doc: sql`${JSON.stringify(doc)}::jsonb`,
+            updated_at: sql`now()`,
+            deleted_at: null,
+          } as any)
+          .where('entity_type' as any, '=', opts.entityId)
+          .where('entity_id' as any, '=', id)
+          .where('organization_id' as any, orgId === null ? 'is' : '=', orgId as any)
+          .executeTakeFirst()
+        if (!updated || Number(updated.numUpdatedRows ?? 0) === 0) {
+          await db.insertInto('custom_entities_storage' as any).values(payload as any).execute()
         }
       } catch (err) {
         // Surface a clear error so it doesn't silently fall back only to EAV
@@ -322,7 +345,7 @@ export class DefaultDataEngine implements DataEngine {
   }
 
   async updateCustomEntityRecord(opts: Parameters<DataEngine['updateCustomEntityRecord']>[0]): Promise<void> {
-    const knex = this.em.getConnection().getKnex()
+    const db = this.getKysely()
     const sanitizedValues = await sanitizeCustomFieldHtmlRichTextValuesServer(this.em, {
       entityId: opts.entityId,
       organizationId: opts.organizationId ?? null,
@@ -336,26 +359,38 @@ export class DefaultDataEngine implements DataEngine {
 
     // Merge doc shallowly: load existing doc and overlay
     await this.ensureStorageTableExists()
-    const row = await knex('custom_entities_storage')
-      .where({ entity_type: opts.entityId, entity_id: id, organization_id: orgId })
-      .first()
-    const prevDoc: Record<string, unknown> = row?.doc || { id }
+    const applyScope = <T extends { where: (col: any, op: any, val?: any) => T }>(q: T) => {
+      let chain = q.where('entity_type' as any, '=', opts.entityId)
+      chain = chain.where('entity_id' as any, '=', id)
+      chain = orgId === null
+        ? chain.where('organization_id' as any, 'is', null as any)
+        : chain.where('organization_id' as any, '=', orgId)
+      return chain
+    }
+    const row = await applyScope(
+      db.selectFrom('custom_entities_storage' as any).select(['doc' as any])
+    ).executeTakeFirst()
+    const prevDoc: Record<string, unknown> = (row as any)?.doc || { id }
     const nextDoc: Record<string, unknown> = { ...prevDoc, ...this.normalizeDocValues(sanitizedValues || {}), id }
     try {
-      const updated = await knex('custom_entities_storage')
-        .where({ entity_type: opts.entityId, entity_id: id, organization_id: orgId })
-        .update({ doc: nextDoc, updated_at: knex.fn.now(), deleted_at: null })
-      if (!updated) {
-        await knex('custom_entities_storage').insert({
+      const updated = await applyScope(
+        db.updateTable('custom_entities_storage' as any).set({
+          doc: sql`${JSON.stringify(nextDoc)}::jsonb`,
+          updated_at: sql`now()`,
+          deleted_at: null,
+        } as any) as any
+      ).executeTakeFirst()
+      if (!updated || Number((updated as any).numUpdatedRows ?? 0) === 0) {
+        await db.insertInto('custom_entities_storage' as any).values({
           entity_type: opts.entityId,
           entity_id: id,
           organization_id: orgId,
           tenant_id: tenantId,
-          doc: nextDoc,
-          created_at: knex.fn.now(),
-          updated_at: knex.fn.now(),
+          doc: sql`${JSON.stringify(nextDoc)}::jsonb`,
+          created_at: sql`now()`,
+          updated_at: sql`now()`,
           deleted_at: null,
-        })
+        } as any).execute()
       }
     } catch (err) {
       throw err
@@ -375,19 +410,29 @@ export class DefaultDataEngine implements DataEngine {
   }
 
   async deleteCustomEntityRecord(opts: Parameters<DataEngine['deleteCustomEntityRecord']>[0]): Promise<void> {
-    const knex = this.em.getConnection().getKnex()
+    const db = this.getKysely()
     const id = String(opts.recordId)
     const orgId = opts.organizationId ?? null
     const soft = opts.soft !== false
 
+    const applyScope = <T extends { where: (col: any, op: any, val?: any) => T }>(q: T) => {
+      let chain = q.where('entity_type' as any, '=', opts.entityId)
+      chain = chain.where('entity_id' as any, '=', id)
+      chain = orgId === null
+        ? chain.where('organization_id' as any, 'is', null as any)
+        : chain.where('organization_id' as any, '=', orgId)
+      return chain
+    }
+
     if (soft) {
-      await knex('custom_entities_storage')
-        .where({ entity_type: opts.entityId, entity_id: id, organization_id: orgId })
-        .update({ deleted_at: knex.fn.now(), updated_at: knex.fn.now() })
+      await applyScope(
+        db.updateTable('custom_entities_storage' as any).set({
+          deleted_at: sql`now()`,
+          updated_at: sql`now()`,
+        } as any) as any
+      ).execute()
     } else {
-      await knex('custom_entities_storage')
-        .where({ entity_type: opts.entityId, entity_id: id, organization_id: orgId })
-        .delete()
+      await applyScope(db.deleteFrom('custom_entities_storage' as any) as any).execute()
     }
 
     // Soft-delete EAV values to preserve current behavior
@@ -405,16 +450,19 @@ export class DefaultDataEngine implements DataEngine {
         record.deletedAt = now
         return true
       })
-      if (mutated.length) await this.em.persistAndFlush(values)
+      if (mutated.length) {
+        for (const record of values) this.em.persist(record)
+        await this.em.flush()
+      }
     } catch { /* non-blocking */ }
   }
 
   async createOrmEntity<T extends object>(opts: { entity: EntityName<T>; data: EntityData<T> }): Promise<T> {
     const entity = this.em.create(
-      opts.entity,
-      opts.data as RequiredEntityData<T, never, true>
+      opts.entity as EntityName<T>,
+      opts.data as unknown as RequiredEntityData<T>
     )
-    await this.em.persistAndFlush(entity)
+    await this.em.persist(entity).flush()
     return entity
   }
 
@@ -423,10 +471,10 @@ export class DefaultDataEngine implements DataEngine {
     where: FilterQuery<T>
     apply: (current: T) => Promise<void> | void
   }): Promise<T | null> {
-    const current = await this.em.findOne(opts.entity, opts.where)
+    const current = await this.em.findOne(opts.entity as EntityName<T>, opts.where as FilterQuery<NoInfer<T>>)
     if (!current) return null
     await opts.apply(current)
-    await this.em.persistAndFlush(current)
+    await this.em.persist(current).flush()
     return current
   }
 
@@ -436,16 +484,16 @@ export class DefaultDataEngine implements DataEngine {
     soft?: boolean
     softDeleteField?: keyof T & string
   }): Promise<T | null> {
-    const current = await this.em.findOne(opts.entity, opts.where)
+    const current = await this.em.findOne(opts.entity as EntityName<T>, opts.where as FilterQuery<NoInfer<T>>)
     if (!current) return null
     if (opts.soft !== false) {
       const field = opts.softDeleteField || ('deletedAt' as keyof T & string)
       if (typeof current === 'object' && current !== null) {
         ;(current as Record<string, unknown>)[field] = new Date()
-        await this.em.persistAndFlush(current)
+        await this.em.persist(current).flush()
       }
     } else {
-      await this.em.removeAndFlush(current)
+      await this.em.remove(current).flush()
     }
     return current
   }

package/src/lib/db/mikro.ts

@@ -1,10 +1,13 @@
 import 'dotenv/config'
 import 'reflect-metadata'
 import { MikroORM } from '@mikro-orm/core'
-import { PostgreSqlDriver } from '@mikro-orm/postgresql'
+import { ReflectMetadataProvider } from '@mikro-orm/decorators/legacy'
+import { PostgreSqlDriver, type EntityManager as PostgreSqlEntityManager } from '@mikro-orm/postgresql'
 import { getSslConfig } from './ssl'
 
-let ormInstance: MikroORM<PostgreSqlDriver> | null = null
+export type AppMikroORM = MikroORM<PostgreSqlDriver, PostgreSqlEntityManager<PostgreSqlDriver>>
+
+let ormInstance: AppMikroORM | null = null
 
 // Use globalThis so standalone apps survive duplicated shared package module instances.
 const GLOBAL_ENTITIES_KEY = '__openMercatoOrmEntities__'
@@ -14,7 +17,7 @@ function getRegisteredEntities(): any[] | null {
 }
 
 function setRegisteredEntities(entities: any[]): void {
-  ;(globalThis as Record<string, unknown>)[GLOBAL_ENTITIES_KEY] = entities
+  (globalThis as Record<string, unknown>)[GLOBAL_ENTITIES_KEY] = entities
 }
 
 export function registerOrmEntities(entities: any[]) {
@@ -36,10 +39,13 @@ export async function getOrm() {
   if (ormInstance) {
     return ormInstance
   }
+
   const entities = getOrmEntities()
   const clientUrl = process.env.DATABASE_URL
-  if (!clientUrl) throw new Error('DATABASE_URL is not set')
-  
+  if (!clientUrl) {
+    throw new Error('DATABASE_URL is not set')
+  }
+
   // Parse connection pool settings from environment
   const poolMin = parseInt(process.env.DB_POOL_MIN || '2')
   const poolMax = parseInt(process.env.DB_POOL_MAX || '20')
@@ -64,38 +70,33 @@ export async function getOrm() {
 
   const sslConfig = getSslConfig()
 
-  ormInstance = await MikroORM.init<PostgreSqlDriver>({
+  ormInstance = await MikroORM.init<PostgreSqlDriver, PostgreSqlEntityManager<PostgreSqlDriver>>({
     driver: PostgreSqlDriver,
     clientUrl,
     entities,
     debug: false,
-    // Connection pooling configuration
+    // v7 no longer defaults to ReflectMetadataProvider. Entities in this repo use
+    // `@mikro-orm/decorators/legacy`, which relies on TypeScript `emitDecoratorMetadata`
+    // + reflect-metadata for type inference (nullability, column types). Without this,
+    // inferred types are silently wrong at runtime.
+    metadataProvider: ReflectMetadataProvider,
+    // MikroORM v7 pool shape (min/max/idleTimeoutMillis). Knex-era `acquireTimeoutMillis` /
+    // `destroyTimeoutMillis` were removed; acquire wait maps to pg `connectionTimeoutMillis`
+    // below under `driverOptions`.
     pool: {
       min: poolMin,
       max: poolMax,
       idleTimeoutMillis: poolIdleTimeout,
-      acquireTimeoutMillis: poolAcquireTimeout,
-      // Close idle connections after 30 seconds
-      destroyTimeoutMillis: process.env.NODE_ENV === 'production' ? 30000 : 3000,
     },
-    // Connection options
+    // Driver options are merged into pg.PoolConfig (ClientConfig + pg-pool).
     driverOptions: {
-      // Enable connection pooling
-      connection: {
-        // Maximum number of connections in the pool
-        max: poolMax,
-        // Minimum number of connections in the pool
-        min: poolMin,
-        // Close connections after this many milliseconds of inactivity
-        idleTimeoutMillis: poolIdleTimeout,
-        // Maximum time to wait for a connection from the pool
-        acquireTimeoutMillis: poolAcquireTimeout,
-        idle_in_transaction_session_timeout: idleInTransactionTimeoutMs,
-        options: connectionOptions,
-        ssl: sslConfig,
-      },
+      connectionTimeoutMillis: poolAcquireTimeout,
+      idle_in_transaction_session_timeout: idleInTransactionTimeoutMs,
+      options: connectionOptions,
+      ssl: sslConfig,
     },
   })
+
   return ormInstance
 }
 

package/src/lib/indexers/error-log.ts

@@ -1,5 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 
 export type IndexerErrorSource = 'query_index' | 'vector' | 'fulltext'
 
@@ -16,7 +16,7 @@ export type RecordIndexerErrorInput = {
 
 type RecordIndexerErrorDeps = {
   em?: EntityManager
-  knex?: Knex
+  db?: Kysely<any>
 }
 
 const MAX_MESSAGE_LENGTH = 8_192
@@ -58,14 +58,11 @@ function safeJson(value: unknown): unknown {
   }
 }
 
-function pickKnex(deps: RecordIndexerErrorDeps): Knex | null {
-  if (deps.knex) return deps.knex
+function pickDb(deps: RecordIndexerErrorDeps): Kysely<any> | null {
+  if (deps.db) return deps.db
   if (deps.em) {
     try {
-      const connection = deps.em.getConnection()
-      if (connection && typeof connection.getKnex === 'function') {
-        return connection.getKnex()
-      }
+      return deps.em.getKysely<any>()
     } catch {
       return null
     }
@@ -74,9 +71,9 @@ function pickKnex(deps: RecordIndexerErrorDeps): Knex | null {
 }
 
 export async function recordIndexerError(deps: RecordIndexerErrorDeps, input: RecordIndexerErrorInput): Promise<void> {
-  const knex = pickKnex(deps)
-  if (!knex) {
-    console.error('[indexers] Unable to record indexer error (missing knex connection)', {
+  const db = pickDb(deps)
+  if (!db) {
+    console.error('[indexers] Unable to record indexer error (missing db connection)', {
       source: input.source,
       handler: input.handler,
     })
@@ -88,18 +85,21 @@ export async function recordIndexerError(deps: RecordIndexerErrorDeps, input: Re
   const now = new Date()
 
   try {
-    await knex('indexer_error_logs').insert({
-      source: input.source,
-      handler: input.handler,
-      entity_type: input.entityType ?? null,
-      record_id: input.recordId ?? null,
-      tenant_id: input.tenantId ?? null,
-      organization_id: input.organizationId ?? null,
-      payload,
-      message: truncate(message, MAX_MESSAGE_LENGTH),
-      stack: truncate(stack, MAX_STACK_LENGTH),
-      occurred_at: now,
-    })
+    await db
+      .insertInto('indexer_error_logs' as any)
+      .values({
+        source: input.source,
+        handler: input.handler,
+        entity_type: input.entityType ?? null,
+        record_id: input.recordId ?? null,
+        tenant_id: input.tenantId ?? null,
+        organization_id: input.organizationId ?? null,
+        payload: payload === null ? null : sql`${JSON.stringify(payload)}::jsonb`,
+        message: truncate(message, MAX_MESSAGE_LENGTH),
+        stack: truncate(stack, MAX_STACK_LENGTH),
+        occurred_at: now,
+      } as any)
+      .execute()
   } catch (loggingError) {
     console.error('[indexers] Failed to persist indexer error', loggingError)
   }