create-mercato-app 0.5.1-develop.2691.d8a0934b37 → 0.5.1-develop.2694.732417c5ec

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mercato-app",
-  "version": "0.5.1-develop.2691.d8a0934b37",
+  "version": "0.5.1-develop.2694.732417c5ec",
   "type": "module",
   "description": "Create a new Open Mercato application",
   "main": "./dist/index.js",

package/template/src/app/page.tsx

@@ -11,6 +11,8 @@ import Link from 'next/link'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { User } from '@open-mercato/core/modules/auth/data/entities'
+import { Tenant, Organization } from '@open-mercato/core/modules/directory/data/entities'
 
 function FeatureBadge({ label }: { label: string }) {
   return (
@@ -60,9 +62,9 @@ export default async function Home() {
   try {
     const container = await createRequestContainer()
     const em = container.resolve<EntityManager>('em')
-    usersCount = await em.count('User', {})
-    tenantsCount = await em.count('Tenant', {})
-    orgsCount = await em.count('Organization', {})
+    usersCount = await em.count(User, {})
+    tenantsCount = await em.count(Tenant, {})
+    orgsCount = await em.count(Organization, {})
     dbStatus = t('app.page.dbStatus.connected', 'Connected')
   } catch (error: unknown) {
     const message = error instanceof Error ? error.message : t('app.page.dbStatus.noConnection', 'no connection')

package/template/src/modules/example/api/todos/route.ts

@@ -191,25 +191,32 @@ export const { metadata, GET, POST, PUT, DELETE } = makeCrudRoute({
           .map((d: any) => d.key)
         // Fallback discovery: keys that have values even if no definition exists
         try {
-          const knex = (em as any).getConnection().getKnex()
-          const rows = await knex('custom_field_values')
-            .distinct('field_key')
-            .where({ entity_id: ENTITY_ID as any })
-            .modify((qb: any) => {
-              if (scopedOrgIds === null) {
-                // no organization restriction
-              } else if (scopedOrgIds.length > 0) {
-                qb.andWhere((b: any) => {
-                  b.whereIn('organization_id', scopedOrgIds as any)
-                  b.orWhereNull('organization_id')
-                })
-              } else {
-                qb.whereNull('organization_id')
-              }
-              if (ctx.auth!.tenantId != null) qb.andWhere((b: any) => b.where({ tenant_id: ctx.auth!.tenantId }).orWhereNull('tenant_id'))
-              else qb.whereNull('tenant_id')
-            })
-            .whereNull('deleted_at')
+          const db = (em as any).getKysely()
+          let cfvQuery = db
+            .selectFrom('custom_field_values')
+            .select('field_key')
+            .distinct()
+            .where('entity_id', '=', ENTITY_ID as any)
+            .where('deleted_at', 'is', null)
+          if (scopedOrgIds === null) {
+            // no organization restriction
+          } else if (scopedOrgIds.length > 0) {
+            cfvQuery = cfvQuery.where((eb: any) => eb.or([
+              eb('organization_id', 'in', scopedOrgIds),
+              eb('organization_id', 'is', null),
+            ]))
+          } else {
+            cfvQuery = cfvQuery.where('organization_id', 'is', null)
+          }
+          if (ctx.auth!.tenantId != null) {
+            cfvQuery = cfvQuery.where((eb: any) => eb.or([
+              eb('tenant_id', '=', ctx.auth!.tenantId),
+              eb('tenant_id', 'is', null),
+            ]))
+          } else {
+            cfvQuery = cfvQuery.where('tenant_id', 'is', null)
+          }
+          const rows = await cfvQuery.execute()
           const keysFromValues = (rows || []).map((r: any) => String(r.field_key))
           // Merge with code-declared keys and de-dupe
           dynamicCfKeys = Array.from(new Set([ ...cfSel.keys, ...keysFromDefs, ...keysFromValues ]))

package/template/src/modules/example/commands/todos.ts

@@ -407,7 +407,7 @@ const deleteTodoCommand: CommandHandler<{ body?: Record<string, unknown>; query?
       restored.isDone = before.is_done
       restored.tenantId = before.tenantId ?? scope.tenantId
       restored.organizationId = before.organizationId ?? scope.organizationId
-      await em.persistAndFlush(restored)
+      await em.persist(restored).flush()
     } else {
       restored = await de.createOrmEntity({
         entity: Todo,

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

@@ -1,4 +1,4 @@
-import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
+import { Entity, PrimaryKey, Property } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'example_items' })
 export class ExampleItem {

package/template/src/modules/example_customers_sync/api/example-customers-sync/mappings/route.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { type Kysely } from 'kysely'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -82,9 +83,10 @@ export async function GET(request: Request) {
         : []
 
     const em = (container.resolve('em') as EntityManager).fork()
-    const knex = em.getKnex()
-    const rowsQuery = knex('example_customer_interaction_mappings')
-      .select<MappingRow[]>([
+    const db = (em as any).getKysely() as Kysely<any>
+    let rowsQuery = db
+      .selectFrom('example_customer_interaction_mappings')
+      .select([
         'id',
         'interaction_id',
         'todo_id',
@@ -97,29 +99,32 @@ export async function GET(request: Request) {
         'organization_id',
         'tenant_id',
       ])
-      .where('tenant_id', auth.tenantId)
+      .where('tenant_id', '=', auth.tenantId)
       .orderBy('updated_at', 'desc')
       .orderBy('id', 'desc')
       .limit(query.limit + 1)
 
     if (organizationIds.length > 0) {
-      rowsQuery.whereIn('organization_id', organizationIds)
+      rowsQuery = rowsQuery.where('organization_id', 'in', organizationIds)
     }
     if (query.interactionId) {
-      rowsQuery.andWhere('interaction_id', query.interactionId)
+      rowsQuery = rowsQuery.where('interaction_id', '=', query.interactionId)
     }
     if (query.todoId) {
-      rowsQuery.andWhere('todo_id', query.todoId)
+      rowsQuery = rowsQuery.where('todo_id', '=', query.todoId)
     }
     if (cursor) {
-      rowsQuery.andWhere(function applyCursor() {
-        this.where('updated_at', '<', new Date(cursor.updatedAt)).orWhere(function applyTieBreaker() {
-          this.where('updated_at', new Date(cursor.updatedAt)).andWhere('id', '<', cursor.id)
-        })
-      })
+      const cursorDate = new Date(cursor.updatedAt)
+      rowsQuery = rowsQuery.where(eb => eb.or([
+        eb('updated_at', '<', cursorDate),
+        eb.and([
+          eb('updated_at', '=', cursorDate),
+          eb('id', '<', cursor.id),
+        ]),
+      ]))
     }
 
-    const rows = await rowsQuery
+    const rows = (await rowsQuery.execute()) as MappingRow[]
     const pageRows = rows.slice(0, query.limit)
     const interactionIds = Array.from(new Set(pageRows.map((row) => row.interaction_id)))
     const interactions = interactionIds.length > 0

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

@@ -1,4 +1,4 @@
-import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'example_customer_interaction_mappings' })
 @Unique({

package/template/src/modules/example_customers_sync/lib/mappings.ts

@@ -247,6 +247,6 @@ export async function deleteExampleCustomerInteractionMapping(
   mapping: ExampleCustomerInteractionMapping | null | undefined,
 ): Promise<boolean> {
   if (!mapping) return false
-  await em.removeAndFlush(mapping)
+  await em.remove(mapping).flush()
   return true
 }

package/template/src/modules/example_customers_sync/lib/sync.ts

@@ -1,4 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { type Kysely } from 'kysely'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import { loadCustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -720,34 +721,36 @@ async function loadLegacyExampleTodoLinks(
   cursor?: string,
 ): Promise<{ rows: LegacyExampleTodoLinkRow[]; nextCursor?: string }> {
   const em = (container.resolve('em') as EntityManager).fork()
-  const knex = em.getKnex()
+  const db = (em as any).getKysely() as Kysely<any>
   const parsedCursor = decodeCursor(cursor)
-  const query = knex('customer_todo_links')
-    .select<LegacyExampleTodoLinkRow[]>([
+  let query = db
+    .selectFrom('customer_todo_links')
+    .select([
       'id',
       'entity_id as entityId',
       'todo_id as todoId',
       'created_by_user_id as createdByUserId',
       'created_at as createdAt',
     ])
-    .where({
-      tenant_id: scope.tenantId,
-      organization_id: scope.organizationId,
-      todo_source: 'example:todo',
-    })
+    .where('tenant_id', '=', scope.tenantId)
+    .where('organization_id', '=', scope.organizationId)
+    .where('todo_source', '=', 'example:todo')
     .orderBy('created_at', 'asc')
     .orderBy('id', 'asc')
     .limit(limit + 1)
 
   if (parsedCursor) {
-    query.andWhere(function applyCursor() {
-      this.where('created_at', '>', new Date(parsedCursor.createdAt)).orWhere(function applyTieBreaker() {
-        this.where('created_at', new Date(parsedCursor.createdAt)).andWhere('id', '>', parsedCursor.id)
-      })
-    })
+    const cursorDate = new Date(parsedCursor.createdAt)
+    query = query.where(eb => eb.or([
+      eb('created_at', '>', cursorDate),
+      eb.and([
+        eb('created_at', '=', cursorDate),
+        eb('id', '>', parsedCursor.id),
+      ]),
+    ]))
   }
 
-  const rows = await query
+  const rows = (await query.execute()) as LegacyExampleTodoLinkRow[]
   const pageRows = rows.slice(0, limit)
   const next = rows.length > limit ? pageRows[pageRows.length - 1] : null
   return {