diff --git a/packages/core/utils/src/modules-sdk/joiner-config-builder.ts b/packages/core/utils/src/modules-sdk/joiner-config-builder.ts index aa7e17139d..00c4244c26 100644 --- a/packages/core/utils/src/modules-sdk/joiner-config-builder.ts +++ b/packages/core/utils/src/modules-sdk/joiner-config-builder.ts @@ -1,10 +1,10 @@ import { JoinerServiceConfigAlias, ModuleJoinerConfig } from "@medusajs/types" -import { join } from "path" +import { dirname, join } from "path" import { + MapToConfig, camelToSnakeCase, deduplicate, getCallerFilePath, - MapToConfig, pluralize, upperCaseFirst, } from "../common" @@ -49,10 +49,17 @@ export function defineJoinerConfig( "serviceName" | "primaryKeys" | "linkableKeys" | "alias" > > { - let basePath = getCallerFilePath() - basePath = basePath.includes("dist") - ? basePath.split("dist")[0] + "dist" - : basePath.split("src")[0] + "src" + const fullPath = getCallerFilePath() + const srcDir = fullPath.includes("dist") ? "dist" : "src" + const splitPath = fullPath.split(srcDir) + + let basePath = splitPath[0] + srcDir + + const isMedusaProject = fullPath.includes(`${srcDir}/modules/`) + if (isMedusaProject) { + basePath = dirname(fullPath) + } + basePath = join(basePath, "models") const models = deduplicate( diff --git a/packages/core/utils/src/modules-sdk/migration-scripts/migration-down.ts b/packages/core/utils/src/modules-sdk/migration-scripts/migration-down.ts index 74bde11512..cd2bbbb12f 100644 --- a/packages/core/utils/src/modules-sdk/migration-scripts/migration-down.ts +++ b/packages/core/utils/src/modules-sdk/migration-scripts/migration-down.ts @@ -2,9 +2,9 @@ import { LoaderOptions, Logger, ModulesSdkTypes } from "@medusajs/types" import { EntitySchema } from "@mikro-orm/core" import { upperCaseFirst } from "../../common" -import { loadDatabaseConfig } from "../load-module-database-config" import { mikroOrmCreateConnection } from "../../dal" import { DmlEntity, toMikroORMEntity } from "../../dml" +import { loadDatabaseConfig } from "../load-module-database-config" /** * Utility function to build a migration script that will revert the migrations. @@ -58,7 +58,7 @@ export function buildRevertMigrationScript({ logger?.error( `${upperCaseFirst( moduleName - )} module migration failed to run - Error: ${error}` + )} module migration failed to run - Error: ${error.errros ?? error}` ) } diff --git a/packages/core/utils/src/modules-sdk/migration-scripts/migration-up.ts b/packages/core/utils/src/modules-sdk/migration-scripts/migration-up.ts index 63e01b1442..07ad62dae5 100644 --- a/packages/core/utils/src/modules-sdk/migration-scripts/migration-up.ts +++ b/packages/core/utils/src/modules-sdk/migration-scripts/migration-up.ts @@ -1,9 +1,9 @@ import { LoaderOptions, Logger, ModulesSdkTypes } from "@medusajs/types" import { EntitySchema } from "@mikro-orm/core" import { upperCaseFirst } from "../../common" -import { loadDatabaseConfig } from "../load-module-database-config" import { mikroOrmCreateConnection } from "../../dal" import { DmlEntity, toMikroORMEntity } from "../../dml" +import { loadDatabaseConfig } from "../load-module-database-config" /** * Utility function to build a migration script that will run the migrations. @@ -65,7 +65,7 @@ export function buildMigrationScript({ moduleName, models, pathToMigrations }) { logger.error( `${upperCaseFirst( moduleName - )} module migration failed to run - Error: ${error}` + )} module migration failed to run - Error: ${error.errros ?? error}` ) } diff --git a/packages/modules/link-modules/src/migration/index.ts b/packages/modules/link-modules/src/migration/index.ts index ca597488d1..9e5634b73c 100644 --- a/packages/modules/link-modules/src/migration/index.ts +++ b/packages/modules/link-modules/src/migration/index.ts @@ -60,7 +60,7 @@ export function getMigration( logger.info(`Link module "${serviceName}" migration executed`) } catch (error) { logger.error( - `Link module "${serviceName}" migration failed to run - Error: ${error}` + `Link module "${serviceName}" migration failed to run - Error: ${error.errros ?? error}` ) } } else { @@ -76,7 +76,9 @@ export function getMigration( logger.info(`Link module "${serviceName}" migration executed`) } catch (error) { logger.error( - `Link module "${serviceName}" migration failed to run - Error: ${error}` + `Link module "${serviceName}" migration failed to run - Error: ${ + error.errros ?? error + }` ) } } @@ -118,7 +120,9 @@ export function getRevertMigration( logger.info(`Link module "${serviceName}" migration executed`) } catch (error) { logger.error( - `Link module "${serviceName}" migration failed to run - Error: ${error}` + `Link module "${serviceName}" migration failed to run - Error: ${ + error.errros ?? error + }` ) }