fix: working api

packages/medusa/src/loaders/index.js

@@ -11,7 +11,7 @@ import modelsLoader from "./models"
 import servicesLoader from "./services"
 import subscribersLoader from "./subscribers"
 import passportLoader from "./passport"
-import pluginsLoader from "./plugins"
+import pluginsLoader, { registerPluginModels } from "./plugins"
 import defaultsLoader from "./defaults"
 import Logger from "./logger"
 import { getManager } from "typeorm"
@@ -64,6 +64,9 @@ export default async ({ directory: rootDirectory, expressApp }) => {
   await modelsLoader({ container })
   Logger.info("Models initialized")
 
+  await registerPluginModels({ rootDirectory, container })
+  Logger.info("Models initialized")
+
   await repositoriesLoader({ container })
   Logger.info("Repositories initialized")
 

packages/medusa/src/loaders/plugins.js

@@ -13,13 +13,32 @@ import { getConfigFile, createRequireFromPath } from "medusa-core-utils"
 import _ from "lodash"
 import path from "path"
 import fs from "fs"
-import { asFunction, aliasTo } from "awilix"
+import { asValue, asClass, asFunction, aliasTo } from "awilix"
 import { sync as existsSync } from "fs-exists-cached"
 
 /**
  * Registers all services in the services directory
  */
 export default async ({ rootDirectory, container, app }) => {
+  const resolved = getResolvedPlugins(rootDirectory)
+
+  await Promise.all(
+    resolved.map(async pluginDetails => {
+      registerRepositories(pluginDetails, container)
+      await registerServices(pluginDetails, container)
+      registerMedusaApi(pluginDetails, container)
+      registerApi(pluginDetails, app, rootDirectory, container)
+      registerCoreRouters(pluginDetails, container)
+      registerSubscribers(pluginDetails, container)
+    })
+  )
+
+  await Promise.all(
+    resolved.map(async pluginDetails => runLoaders(pluginDetails, container))
+  )
+}
+
+function getResolvedPlugins(rootDirectory) {
   const { configModule } = getConfigFile(rootDirectory, `medusa-config`)
 
   if (!configModule) {
@@ -47,21 +66,16 @@ export default async ({ rootDirectory, container, app }) => {
     version: createFileContentHash(process.cwd(), `**`),
   })
 
+  return resolved
+}
+
+export async function registerPluginModels({ rootDirectory, container }) {
+  const resolved = getResolvedPlugins(rootDirectory)
   await Promise.all(
     resolved.map(async pluginDetails => {
-      // registerModels(pluginDetails, container)
-      registerRepositories(pluginDetails, container)
-      await registerServices(pluginDetails, container)
-      registerMedusaApi(pluginDetails, container)
-      registerApi(pluginDetails, app, rootDirectory, container)
-      registerCoreRouters(pluginDetails, container)
-      registerSubscribers(pluginDetails, container)
+      registerModels(pluginDetails, container)
     })
   )
-
-  await Promise.all(
-    resolved.map(async pluginDetails => runLoaders(pluginDetails, container))
-  )
 }
 
 async function runLoaders(pluginDetails, container) {
@@ -309,7 +323,6 @@ function registerRepositories(pluginDetails, container) {
     Object.entries(loaded).map(([key, val]) => {
       if (typeof val === "function") {
         const name = formatRegistrationName(fn)
-        console.log(name)
         container.register({
           [name]: asClass(val),
         })
@@ -336,14 +349,12 @@ function registerModels(pluginDetails, container) {
 
     Object.entries(loaded).map(([key, val]) => {
       if (typeof val === "function" || val instanceof EntitySchema) {
-        if (config.register) {
-          const name = formatRegistrationName(fn)
-          container.register({
-            [name]: asClass(val),
-          })
+        const name = formatRegistrationName(fn)
+        container.register({
+          [name]: asClass(val),
+        })
 
-          container.registerAdd("db_entities", asValue(val))
-        }
+        container.registerAdd("db_entities", asValue(val))
       }
     })
   })

packages/medusa/yarn.lock

@@ -5662,21 +5662,21 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-medusa-core-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.0.tgz#0641b365b769dbf99856025d935eef5cf5d81f2c"
-  integrity sha512-zocRthKhLK3eSjrXbAhZZkIMBRxyvU7GcAMFh5UCEgfe7f935vjE7r5lGTr5jTEwgwaoTUk9ep0VBekz0SEdyw==
+medusa-core-utils@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.4.tgz#ec2bb98c83426d7033632cd225b3b5dc62c26f1a"
+  integrity sha512-SzFfMmNbE9ukSfhapJOuYEksOKDo3yYSCeuBLFWnCZZRDnUV4ttH4Yp/ydT+cZKtqZwF2vKceXNbrT4uJYjHgw==
   dependencies:
     joi "^17.3.0"
     joi-objectid "^3.0.1"
 
-medusa-test-utils@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.3.tgz#c2b45d44b9567fa2255e936d7bed73a31dfb42dd"
-  integrity sha512-0saYG5BhEjc4BZP76/2IJL7CyqIdbCasAci+EYXzwnwgS+nCUhKDjzzNAnC+PZMK/teD3M7x4n7isFtjgNSIDQ==
+medusa-test-utils@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.7.tgz#19d0bdf3f6f7fef0bc7f2f8e258f8c66167c692f"
+  integrity sha512-kcN4oJjUEAkFeko7DEaok9Qy3aty41gEzGSdR4F3KPORXZJ+YADHuj4F219/X1k+3iGqCUgmNQ9eKl6Aobq44g==
   dependencies:
     "@babel/plugin-transform-classes" "^7.9.5"
-    medusa-core-utils "^1.1.0"
+    medusa-core-utils "^1.1.4"
     randomatic "^3.1.1"
 
 merge-descriptors@1.0.1: