From 27bb93c5b5607086dc8b7ee0966c147c341658dc Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Mon, 24 Jun 2024 11:31:52 +0200 Subject: [PATCH] chore: Fix export and option of mikro orm define config util (#7809) --- packages/core/utils/src/modules-sdk/index.ts | 1 + .../utils/src/modules-sdk/medusa-internal-service.ts | 2 +- .../src/modules-sdk/mikro-orm-cli-config-builder.ts | 10 +++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/core/utils/src/modules-sdk/index.ts b/packages/core/utils/src/modules-sdk/index.ts index 9f535c83dc..889c87cea6 100644 --- a/packages/core/utils/src/modules-sdk/index.ts +++ b/packages/core/utils/src/modules-sdk/index.ts @@ -12,3 +12,4 @@ export * from "./definition" export * from "./event-builder-factory" export * from "./joiner-config-builder" export * from "./loaders/load-models" +export * from "./mikro-orm-cli-config-builder" diff --git a/packages/core/utils/src/modules-sdk/medusa-internal-service.ts b/packages/core/utils/src/modules-sdk/medusa-internal-service.ts index 6860b36bbb..707ac565b2 100644 --- a/packages/core/utils/src/modules-sdk/medusa-internal-service.ts +++ b/packages/core/utils/src/modules-sdk/medusa-internal-service.ts @@ -537,7 +537,7 @@ export function MedusaInternalService( }, @MedusaContext() sharedContext: Context = {} ): Promise<{ - entities: ExtractEntityType | TEntity[] + entities: ExtractEntityType | ExtractEntityType[] performedActions: PerformedActions }> { const data_ = Array.isArray(data) ? data : [data] diff --git a/packages/core/utils/src/modules-sdk/mikro-orm-cli-config-builder.ts b/packages/core/utils/src/modules-sdk/mikro-orm-cli-config-builder.ts index 10642e1923..1f593a7362 100644 --- a/packages/core/utils/src/modules-sdk/mikro-orm-cli-config-builder.ts +++ b/packages/core/utils/src/modules-sdk/mikro-orm-cli-config-builder.ts @@ -2,9 +2,17 @@ import { MikroORMOptions } from "@mikro-orm/core/utils/Configuration" import { IDmlEntity } from "@medusajs/types" import { DmlEntity, toMikroORMEntity } from "../dml" import { TSMigrationGenerator } from "../dal" +import { AnyEntity, EntityClassGroup, EntitySchema } from "@mikro-orm/core" +import { EntityClass } from "@mikro-orm/core/typings" type Options = Partial & { - entities: (MikroORMOptions["entities"] | IDmlEntity)[] + entities: ( + | string + | EntityClass + | EntityClassGroup + | EntitySchema + | IDmlEntity + )[] databaseName: string }