Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Loading custom modules #6411

Merged
merged 4 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/honest-peaches-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@medusajs/modules-sdk": patch
"@medusajs/medusa": patch
"@medusajs/link-modules": patch
---

Fix custom modules loader
2 changes: 1 addition & 1 deletion packages/link-modules/src/initialize/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export const initialize = async (
}

const logger =
injectedDependencies?.[ContainerRegistrationKeys.LOGGER] ?? console.log
injectedDependencies?.[ContainerRegistrationKeys.LOGGER] ?? console

definition.schema = generateGraphQLSchema(definition, primary, foreign, {
logger,
Expand Down
18 changes: 12 additions & 6 deletions packages/medusa/src/loaders/medusa-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
import {
CommonTypes,
InternalModuleDeclaration,
LoadedModule,
MedusaContainer,
ModuleDefinition,
} from "@medusajs/types"
Expand Down Expand Up @@ -54,12 +55,13 @@ export async function migrateMedusaApp(
},
config = { registerInContainer: true }
): Promise<void> {
const featureFlagRouter = container.resolve<FlagRouter>("featureFlagRouter")
const isMedusaV2Enabled = featureFlagRouter.isFeatureEnabled(MedusaV2Flag.key)
const injectedDependencies = {
[ContainerRegistrationKeys.PG_CONNECTION]: container.resolve(
ContainerRegistrationKeys.PG_CONNECTION
),
[ContainerRegistrationKeys.LOGGER]: container.resolve(
ContainerRegistrationKeys.LOGGER
),
}

const sharedResourcesConfig = {
Expand All @@ -73,7 +75,7 @@ export async function migrateMedusaApp(

// Apply default options to legacy modules
for (const moduleKey of Object.keys(configModules)) {
if (!ModulesDefinition[moduleKey].isLegacy) {
if (!ModulesDefinition[moduleKey]?.isLegacy) {
continue
}

Expand Down Expand Up @@ -121,6 +123,9 @@ export const loadMedusaApp = async (
[ContainerRegistrationKeys.PG_CONNECTION]: container.resolve(
ContainerRegistrationKeys.PG_CONNECTION
),
[ContainerRegistrationKeys.LOGGER]: container.resolve(
ContainerRegistrationKeys.LOGGER
),
}

const sharedResourcesConfig = {
Expand All @@ -137,7 +142,7 @@ export const loadMedusaApp = async (

// Apply default options to legacy modules
for (const moduleKey of Object.keys(configModules)) {
if (!ModulesDefinition[moduleKey].isLegacy) {
if (!ModulesDefinition[moduleKey]?.isLegacy) {
continue
}

Expand Down Expand Up @@ -202,9 +207,10 @@ export const loadMedusaApp = async (
asValue(medusaApp.query)
)

for (const [serviceKey, moduleService] of Object.entries(medusaApp.modules)) {
for (const moduleService of Object.values(medusaApp.modules)) {
const loadedModule = moduleService as LoadedModule
container.register(
ModulesDefinition[serviceKey].registrationName,
loadedModule.__definition.registrationName,
asValue(moduleService)
)
}
Expand Down
9 changes: 9 additions & 0 deletions packages/modules-sdk/src/medusa-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
simpleHash,
stringifyCircular,
} from "@medusajs/utils"
import { EOL } from "os"
import {
moduleLoader,
registerMedusaLinkModule,
Expand Down Expand Up @@ -312,6 +313,14 @@ export class MedusaModule {
keyName
].__joinerConfig()

if (!joinerConfig.primaryKeys) {
logger.warn(
`Primary keys are not defined by the module ${keyName}. Setting default primary key to 'id'${EOL}`
)

joinerConfig.primaryKeys = ["id"]
}

services[keyName].__joinerConfig = joinerConfig
MedusaModule.setJoinerConfig(keyName, joinerConfig)
}
Expand Down
Loading