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

package/src/modules/entities/api/relations/options.ts

@@ -56,11 +56,16 @@ export async function GET(req: Request) {
     labelField = (cfg?.labelField as string | undefined) || ''
   }
   if (!labelField) {
-    const candidates = ['name','title','code','email']
+    const candidates = ['name', 'title', 'code', 'email']
     const table = tableNameFromEntityId(entityId)
-    const knex = (em as any).getConnection().getKnex()
+    const db = (em as any).getKysely() as any
     for (const c of candidates) {
-      const exists = await knex('information_schema.columns').where({ table_name: table, column_name: c }).first()
+      const exists = await db
+        .selectFrom('information_schema.columns')
+        .select('column_name')
+        .where('table_name', '=', table)
+        .where('column_name', '=', c)
+        .executeTakeFirst()
       if (exists) { labelField = c; break }
     }
     if (!labelField) labelField = 'id'

package/src/modules/entities/cli.ts

@@ -223,7 +223,7 @@ const addField: ModuleCli = {
       if (description !== undefined) configJson.description = description
 
       if (!existing) {
-        await em.persistAndFlush(em.create(CustomFieldDef, {
+        await em.persist(em.create(CustomFieldDef, {
           entityId,
           organizationId: orgId,
           tenantId: tenantId,
@@ -231,7 +231,7 @@ const addField: ModuleCli = {
           kind,
           configJson,
           isActive: true,
-        }))
+        })).flush()
         console.log(`Created custom field: ${entityId}.${key} (${kind})${orgId == null ? ' [global]' : ` [org=${orgId}, tenant=${tenantId}]`}`)
       } else {
         existing.kind = kind as any
@@ -272,7 +272,7 @@ async function upsertEncryptionMaps(em: any, tenantId: string, organizationId: s
       existing.isActive = true
       existing.updatedAt = new Date()
       logger(`🔒 Updated encryption map for ${spec.entityId} ✨`)
-      await em.persistAndFlush(existing)
+      await em.persist(existing).flush()
       continue
     }
     const map = em.create(EncryptionMap, {
@@ -282,7 +282,7 @@ async function upsertEncryptionMaps(em: any, tenantId: string, organizationId: s
       fieldsJson: spec.fields,
       isActive: true,
     })
-    await em.persistAndFlush(map)
+    await em.persist(map).flush()
     logger(`Created encryption map for ${spec.entityId}`)
   }
 }

package/src/modules/entities/data/entities.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryKey, Property, Index } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property } from '@mikro-orm/decorators/legacy'
 
 // Definitions of custom fields scoped to an entity type and organization
 @Entity({ tableName: 'custom_field_defs' })

package/src/modules/entities/lib/field-definitions.ts

@@ -91,7 +91,7 @@ export async function ensureCustomFieldDefinitions(
 
       if (!existing) {
         if (!scope.dryRun) {
-          await em.persistAndFlush(
+          await em.persist(
             em.create(CustomFieldDef, {
               entityId: set.entity,
               organizationId: scope.organizationId,
@@ -103,7 +103,7 @@ export async function ensureCustomFieldDefinitions(
               createdAt: new Date(),
               updatedAt: new Date(),
             })
-          )
+          ).flush()
         }
         created++
         continue

package/src/modules/entities/lib/register.ts

@@ -64,7 +64,7 @@ export async function upsertCustomEntity(em: EntityManager, entityId: string, op
       if (!ent) {
         if (dryRun) return 'created'
         ent = tem.create(CustomEntity as any, { ...where, ...desired, createdAt: now, updatedAt: now, deletedAt: null })
-        await tem.persistAndFlush(ent)
+        await tem.persist(ent).flush()
         return 'created' as UpsertCustomEntityResult
       }
       if (createOnly) return 'unchanged'

package/src/modules/feature_toggles/data/entities.ts

@@ -1,12 +1,5 @@
-import {
-  Entity,
-  Index,
-  OptionalProps,
-  PrimaryKey,
-  Property,
-  Unique,
-  ManyToOne,
-} from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 import type { JsonValue } from '@open-mercato/shared/lib/json'
 
 

package/src/modules/inbox_ops/api/proposals/counts/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse } from 'next/server'
+import { sql } from 'kysely'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { runWithCacheTenant } from '@open-mercato/cache'
 import { InboxProposal } from '../../../data/entities'
@@ -45,17 +46,16 @@ export async function GET(req: Request) {
     ])
 
     // Single GROUP BY query for category counts — O(1) queries
-    const knex = ctx.em.getKnex()
-    const categoryRows = await knex('inbox_proposals')
-      .select('category')
-      .count('* as count')
-      .where({
-        organization_id: ctx.organizationId,
-        tenant_id: ctx.tenantId,
-        is_active: true,
-      })
-      .whereNull('deleted_at')
+    const db = ctx.em.getKysely<any>() as any
+    const categoryRows = await db
+      .selectFrom('inbox_proposals')
+      .select(['category', sql<string>`count(*)`.as('count')])
+      .where('organization_id', '=', ctx.organizationId)
+      .where('tenant_id', '=', ctx.tenantId)
+      .where('is_active', '=', true)
+      .where('deleted_at', 'is', null)
       .groupBy('category')
+      .execute() as Array<{ category: string | null; count: string | number }>
 
     const byCategory: Record<string, number> = {}
     for (const cat of ALL_CATEGORIES) {

package/src/modules/inbox_ops/data/entities.ts

@@ -1,11 +1,5 @@
-import {
-  Entity,
-  PrimaryKey,
-  Property,
-  Index,
-  Unique,
-  OptionalProps,
-} from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 // ---------------------------------------------------------------------------
 // Shared Types

package/src/modules/inbox_ops/lib/messagesIntegration.ts

@@ -54,16 +54,17 @@ export async function resolveMessageSenderUserId(
   scope: { tenantId: string; organizationId: string },
 ): Promise<string> {
   try {
-    // Direct knex: users.email is a plaintext login field, not encrypted at
-    // field level, so findOneWithDecryption is unnecessary here.
-    const knex = em.getKnex()
+    // users.email is a plaintext login field, not encrypted at field level,
+    // so findOneWithDecryption is unnecessary here.
+    const db = em.getKysely<any>() as any
     const normalizedEmail = forwardedByEmail.trim().toLowerCase()
     if (normalizedEmail) {
-      const row = await knex('users')
+      const row = await db
+        .selectFrom('users')
         .select('id')
-        .where('email', normalizedEmail)
-        .whereNull('deleted_at')
-        .first()
+        .where('email', '=', normalizedEmail)
+        .where('deleted_at', 'is', null)
+        .executeTakeFirst() as { id?: string } | undefined
       if (row?.id) return row.id
     }
   } catch {
@@ -100,9 +101,9 @@ export async function createMessageRecordForEmail(
     if (!commandBus) return null
 
     const em = ctx.container.resolve('em') as EntityManager
-    const knex = em.getKnex()
+    const db = em.getKysely<any>()
     const recipientUserIds = await getRecipientUserIdsForFeature(
-      knex, ctx.scope.tenantId, 'inbox_ops.proposals.view',
+      db, ctx.scope.tenantId, 'inbox_ops.proposals.view',
     )
 
     const recipients = recipientUserIds.map((userId) => ({ userId, type: 'to' as const }))
@@ -174,9 +175,9 @@ export async function createMessageRecordForReply(
     if (!commandBus) return null
 
     const em = ctx.container.resolve('em') as EntityManager
-    const knex = em.getKnex()
+    const db = em.getKysely<any>()
     const recipientUserIds = await getRecipientUserIdsForFeature(
-      knex, ctx.scope.tenantId, 'inbox_ops.proposals.view',
+      db, ctx.scope.tenantId, 'inbox_ops.proposals.view',
     )
     if (recipientUserIds.length === 0) return null
 

package/src/modules/integrations/data/entities.ts

@@ -1,4 +1,5 @@
-import { Entity, PrimaryKey, Property, Index, OptionalProps } from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'sync_external_id_mappings' })
 @Index({ properties: ['internalEntityType', 'internalEntityId', 'organizationId'] })

package/src/modules/integrations/lib/credentials-service.ts

@@ -176,7 +176,7 @@ export function createCredentialsService(em: EntityManager) {
         organizationId: scope.organizationId,
         tenantId: scope.tenantId,
       })
-      await em.persistAndFlush(created)
+      await em.persist(created).flush()
     },
 
     async saveField(

package/src/modules/integrations/lib/log-service.ts

@@ -53,7 +53,7 @@ export function createIntegrationLogService(em: EntityManager) {
         organizationId: scope.organizationId,
         tenantId: scope.tenantId,
       })
-      await em.persistAndFlush(row)
+      await em.persist(row).flush()
       return row
     },
 

package/src/modules/integrations/lib/state-service.ts

@@ -110,7 +110,7 @@ export function createIntegrationStateService(em: EntityManager) {
         organizationId: scope.organizationId,
         tenantId: scope.tenantId,
       })
-      await em.persistAndFlush(created)
+      await em.persist(created).flush()
       return created
     },
 

package/src/modules/messages/api/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 import type { CommandBus } from '@open-mercato/shared/lib/commands/command-bus'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi/types'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -28,8 +28,8 @@ type MessageCommandExecuteResultWithThreadId = MessageCommandExecuteResult & {
 
 const NO_MATCH_ID = '00000000-0000-0000-0000-000000000000'
 
-function getKnex(em: EntityManager): Knex {
-  return (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+function getDb(em: EntityManager): Kysely<any> {
+  return em.getKysely<any>()
 }
 
 type MessageListScopeRow = {
@@ -61,142 +61,151 @@ export async function GET(req: Request) {
   const url = new URL(req.url)
   const params = Object.fromEntries(url.searchParams)
   const input = listMessagesSchema.parse(params)
-  const knex = getKnex(em)
+  const db = getDb(em) as any
 
-  let query = knex('messages as m')
-    .where('m.tenant_id', scope.tenantId)
-    .whereNull('m.deleted_at')
-
-  if (scope.organizationId) {
-    query = query.where('m.organization_id', scope.organizationId)
-  } else {
-    query = query.whereNull('m.organization_id')
-  }
-
-  const joinRecipient = () => {
-    query = query.leftJoin('message_recipients as r', function () {
-      this.on('m.id', '=', 'r.message_id').andOn('r.recipient_user_id', '=', knex.raw('?', [scope.userId]))
-    })
-  }
-
-  switch (input.folder) {
-    case 'inbox':
-      joinRecipient()
-      query = query
-        .whereNotNull('r.message_id')
-        .whereNull('r.deleted_at')
-        .whereNull('r.archived_at')
-        .where('m.is_draft', false)
-      break
-    case 'archived':
-      joinRecipient()
-      query = query
-        .whereNotNull('r.message_id')
-        .whereNull('r.deleted_at')
-        .whereNotNull('r.archived_at')
-      break
-    case 'sent':
-      query = query
-        .where('m.sender_user_id', scope.userId)
-        .where('m.is_draft', false)
-      joinRecipient()
-      break
-    case 'drafts':
-      query = query
-        .where('m.sender_user_id', scope.userId)
-        .where('m.is_draft', true)
-      joinRecipient()
-      break
-    case 'all':
-      joinRecipient()
-      query = query.where(function () {
-        this.where('m.sender_user_id', scope.userId).orWhereNotNull('r.message_id')
+  const searchIds = input.search
+    ? await findMessageIdsBySearchTokens({
+        em,
+        query: input.search,
+        tenantId: scope.tenantId ?? null,
+        organizationId: scope.organizationId,
       })
-      break
-    default: {
-      const unsupportedFolder: never = input.folder
-      throw new Error(`Unsupported folder: ${String(unsupportedFolder)}`)
-    }
-  }
+    : undefined
 
-  if (input.status) {
-    query = query.where('r.status', input.status)
-  }
-
-  if (input.type) {
-    query = query.where('m.type', input.type)
-  }
+  const buildBaseQuery = () => {
+    let q: any = db
+      .selectFrom('messages as m')
+      .where('m.tenant_id', '=', scope.tenantId)
+      .where('m.deleted_at', 'is', null)
 
-  if (input.visibility) {
-    query = query.where('m.visibility', input.visibility)
-  }
+    if (scope.organizationId) {
+      q = q.where('m.organization_id', '=', scope.organizationId)
+    } else {
+      q = q.where('m.organization_id', 'is', null)
+    }
 
-  if (input.sourceEntityType) {
-    query = query.where('m.source_entity_type', input.sourceEntityType)
-  }
+    const joinRecipient = () => {
+      q = q.leftJoin('message_recipients as r', (jb: any) => jb
+        .onRef('m.id', '=', 'r.message_id')
+        .on('r.recipient_user_id', '=', scope.userId))
+    }
 
-  if (input.sourceEntityId) {
-    query = query.where('m.source_entity_id', input.sourceEntityId)
-  }
+    switch (input.folder) {
+      case 'inbox':
+        joinRecipient()
+        q = q
+          .where('r.message_id', 'is not', null)
+          .where('r.deleted_at', 'is', null)
+          .where('r.archived_at', 'is', null)
+          .where('m.is_draft', '=', false)
+        break
+      case 'archived':
+        joinRecipient()
+        q = q
+          .where('r.message_id', 'is not', null)
+          .where('r.deleted_at', 'is', null)
+          .where('r.archived_at', 'is not', null)
+        break
+      case 'sent':
+        q = q
+          .where('m.sender_user_id', '=', scope.userId)
+          .where('m.is_draft', '=', false)
+        joinRecipient()
+        break
+      case 'drafts':
+        q = q
+          .where('m.sender_user_id', '=', scope.userId)
+          .where('m.is_draft', '=', true)
+        joinRecipient()
+        break
+      case 'all':
+        joinRecipient()
+        q = q.where((eb: any) => eb.or([
+          eb('m.sender_user_id', '=', scope.userId),
+          eb('r.message_id', 'is not', null),
+        ]))
+        break
+      default: {
+        const unsupportedFolder: never = input.folder
+        throw new Error(`Unsupported folder: ${String(unsupportedFolder)}`)
+      }
+    }
 
-  if (input.externalEmail) {
-    query = query.where('m.external_email_hash', hashForLookup(input.externalEmail))
-  }
+    if (input.status) q = q.where('r.status', '=', input.status)
+    if (input.type) q = q.where('m.type', '=', input.type)
+    if (input.visibility) q = q.where('m.visibility', '=', input.visibility)
+    if (input.sourceEntityType) q = q.where('m.source_entity_type', '=', input.sourceEntityType)
+    if (input.sourceEntityId) q = q.where('m.source_entity_id', '=', input.sourceEntityId)
+    if (input.externalEmail) q = q.where('m.external_email_hash', '=', hashForLookup(input.externalEmail))
+    if (input.senderId) q = q.where('m.sender_user_id', '=', input.senderId)
+
+    if (input.search) {
+      if (!searchIds || searchIds.length === 0) {
+        q = q.where('m.id', '=', NO_MATCH_ID)
+      } else {
+        q = q.where('m.id', 'in', searchIds)
+      }
+    }
 
-  if (input.senderId) {
-    query = query.where('m.sender_user_id', input.senderId)
-  }
+    if (input.since) q = q.where('m.sent_at', '>', new Date(input.since))
 
-  if (input.search) {
-    const matchedIds = await findMessageIdsBySearchTokens({
-      em,
-      query: input.search,
-      tenantId: scope.tenantId ?? null,
-      organizationId: scope.organizationId,
-    })
-    if (matchedIds === null || matchedIds.length === 0) {
-      query = query.where('m.id', NO_MATCH_ID)
-    } else {
-      query = query.whereIn('m.id', matchedIds)
+    if (input.hasObjects !== undefined) {
+      const existsFn = (eb: any) => eb.exists(
+        eb.selectFrom('message_objects')
+          .select(sql<number>`1`.as('one'))
+          .whereRef('message_objects.message_id', '=', 'm.id')
+      )
+      const notExistsFn = (eb: any) => eb.not(eb.exists(
+        eb.selectFrom('message_objects')
+          .select(sql<number>`1`.as('one'))
+          .whereRef('message_objects.message_id', '=', 'm.id')
+      ))
+      q = input.hasObjects ? q.where(existsFn) : q.where(notExistsFn)
     }
-  }
-
-  if (input.since) {
-    query = query.where('m.sent_at', '>', new Date(input.since))
-  }
 
-  if (input.hasObjects !== undefined) {
-    const subquery = knex('message_objects').select(1).whereRaw('message_objects.message_id = m.id')
-    query = input.hasObjects ? query.whereExists(subquery) : query.whereNotExists(subquery)
-  }
+    if (input.hasAttachments !== undefined) {
+      const existsFn = (eb: any) => eb.exists(
+        eb.selectFrom('attachments')
+          .select(sql<number>`1`.as('one'))
+          .where('attachments.entity_id', '=', MESSAGE_ATTACHMENT_ENTITY_ID)
+          .whereRef('attachments.record_id', '=', 'm.id')
+      )
+      const notExistsFn = (eb: any) => eb.not(eb.exists(
+        eb.selectFrom('attachments')
+          .select(sql<number>`1`.as('one'))
+          .where('attachments.entity_id', '=', MESSAGE_ATTACHMENT_ENTITY_ID)
+          .whereRef('attachments.record_id', '=', 'm.id')
+      ))
+      q = input.hasAttachments ? q.where(existsFn) : q.where(notExistsFn)
+    }
 
-  if (input.hasAttachments !== undefined) {
-    const subquery = knex('attachments')
-      .select(1)
-      .where('attachments.entity_id', MESSAGE_ATTACHMENT_ENTITY_ID)
-      .whereRaw('attachments.record_id = m.id')
-    query = input.hasAttachments ? query.whereExists(subquery) : query.whereNotExists(subquery)
-  }
+    if (input.hasActions !== undefined) {
+      q = input.hasActions
+        ? q.where('m.action_data', 'is not', null)
+        : q.where('m.action_data', 'is', null)
+    }
 
-  if (input.hasActions !== undefined) {
-    query = input.hasActions ? query.whereNotNull('m.action_data') : query.whereNull('m.action_data')
+    return q
   }
 
-  const countResult = await query.clone().count('* as count').first()
+  const countResult = await buildBaseQuery()
+    .select(sql<number>`count(*)`.as('count'))
+    .executeTakeFirst() as { count: string | number } | undefined
   const total = Number(countResult?.count ?? 0)
 
   const offset = (input.page - 1) * input.pageSize
-  const scopeRows = await query
-    .select(
+  const scopeRows = await buildBaseQuery()
+    .select([
       'm.id',
       'm.sender_user_id',
       'm.is_draft',
       'r.status as recipient_status',
       'r.read_at',
-    )
+    ])
     .orderBy('m.sent_at', 'desc')
     .offset(offset)
     .limit(input.pageSize)
+    .execute()
 
   const typedRows = scopeRows as MessageListScopeRow[]
   const messageIds = typedRows.map((row) => row.id)
@@ -227,12 +236,13 @@ export async function GET(req: Request) {
   }, {} as Record<string, MessageObject[]>)
 
   const attachmentCounts: AttachmentCountRow[] = messageIds.length > 0
-    ? await getKnex(em)('attachments')
-        .select('record_id')
-        .count('* as count')
-        .where('entity_id', MESSAGE_ATTACHMENT_ENTITY_ID)
-        .whereIn('record_id', messageIds)
+    ? await (getDb(em) as any)
+        .selectFrom('attachments')
+        .select(['record_id', sql<string>`count(*)`.as('count')])
+        .where('entity_id', '=', MESSAGE_ATTACHMENT_ENTITY_ID)
+        .where('record_id', 'in', messageIds)
         .groupBy('record_id')
+        .execute()
     : []
 
   const attachmentCountByMessage = attachmentCounts.reduce((acc: Record<string, number>, row) => {
@@ -241,12 +251,13 @@ export async function GET(req: Request) {
   }, {})
 
   const recipientCounts: RecipientCountRow[] = messageIds.length > 0
-    ? await getKnex(em)('message_recipients')
-        .select('message_id')
-        .count('* as count')
-        .whereIn('message_id', messageIds)
-        .whereNull('deleted_at')
+    ? await (getDb(em) as any)
+        .selectFrom('message_recipients')
+        .select(['message_id', sql<string>`count(*)`.as('count')])
+        .where('message_id', 'in', messageIds)
+        .where('deleted_at', 'is', null)
         .groupBy('message_id')
+        .execute()
     : []
 
   const recipientCountByMessage = recipientCounts.reduce((acc: Record<string, number>, row) => {

package/src/modules/messages/api/unread-count/route.ts

@@ -1,5 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi/types'
 import { resolveMessageContext } from '../../lib/routeHelpers'
 import { unreadCountResponseSchema } from '../openapi'
@@ -8,31 +8,34 @@ export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['messages.view'] },
 }
 
-function getKnex(em: EntityManager): Knex {
-  return (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+function getDb(em: EntityManager): Kysely<any> {
+  return em.getKysely<any>()
 }
 
 export async function GET(req: Request) {
   const { ctx, scope } = await resolveMessageContext(req)
   const em = ctx.container.resolve('em') as EntityManager
-  const knex = getKnex(em)
-
-  let query = knex('message_recipients as r')
-    .join('messages as m', 'm.id', 'r.message_id')
-    .where('r.recipient_user_id', scope.userId)
-    .where('r.status', 'unread')
-    .whereNull('r.deleted_at')
-    .whereNull('r.archived_at')
-    .where('m.tenant_id', scope.tenantId)
-    .whereNull('m.deleted_at')
+  const db = getDb(em) as any
+
+  let query = db
+    .selectFrom('message_recipients as r')
+    .innerJoin('messages as m', 'm.id', 'r.message_id')
+    .where('r.recipient_user_id', '=', scope.userId)
+    .where('r.status', '=', 'unread')
+    .where('r.deleted_at', 'is', null)
+    .where('r.archived_at', 'is', null)
+    .where('m.tenant_id', '=', scope.tenantId)
+    .where('m.deleted_at', 'is', null)
 
   if (scope.organizationId) {
-    query = query.where('m.organization_id', scope.organizationId)
+    query = query.where('m.organization_id', '=', scope.organizationId)
   } else {
-    query = query.whereNull('m.organization_id')
+    query = query.where('m.organization_id', 'is', null)
   }
 
-  const row = await query.count('* as count').first<{ count: string | number }>()
+  const row = await query
+    .select(sql<number>`count(*)`.as('count'))
+    .executeTakeFirst() as { count: string | number } | undefined
   const count = Number(row?.count ?? 0)
 
   return Response.json({ unreadCount: count })

package/src/modules/messages/commands/confirmations.ts

@@ -102,7 +102,7 @@ const confirmMessageCommand: CommandHandler<unknown, ConfirmMessageResult> = {
     confirmation.confirmedByUserId = actorUserId
     confirmation.confirmedAt = input.confirmed ? new Date() : null
 
-    await em.persistAndFlush(confirmation)
+    await em.persist(confirmation).flush()
 
     return {
       messageId: confirmation.messageId,