chore: Hide repository creation if they are not custom + add upsert s…

…upport by default (#6127)

.changeset/gold-drinks-smile.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/utils": patch
+"@medusajs/types": patch
+"@medusajs/product": patch
+"@medusajs/pricing": patch
+---
+
+chore: Hide repository creation if they are not custom + add upsert support by default

packages/authentication/integration-tests/__tests__/services/auth-provider/index.spec.ts

@@ -1,9 +1,11 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
-import { AuthProviderRepository } from "@repositories"
 import { AuthProviderService } from "@services"
 
 import { MikroOrmWrapper } from "../../../utils"
 import { createAuthProviders } from "../../../__fixtures__/auth-provider"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -17,13 +19,12 @@ describe("AuthProvider Service", () => {
     repositoryManager = await MikroOrmWrapper.forkManager()
     testManager = await MikroOrmWrapper.forkManager()
 
-    const authProviderRepository = new AuthProviderRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new AuthProviderService({
-      authProviderRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("authProviderService")
 
     await createAuthProviders(testManager)
   })

packages/authentication/integration-tests/__tests__/services/auth-user/index.spec.ts

@@ -1,10 +1,12 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
-import { AuthUserRepository } from "@repositories"
 import { AuthUserService } from "@services"
 
 import { MikroOrmWrapper } from "../../../utils"
 import { createAuthProviders } from "../../../__fixtures__/auth-provider"
 import { createAuthUsers } from "../../../__fixtures__/auth-user"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -18,13 +20,12 @@ describe("AuthUser Service", () => {
     repositoryManager = await MikroOrmWrapper.forkManager()
     testManager = await MikroOrmWrapper.forkManager()
 
-    const authUserRepository = new AuthUserRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new AuthUserService({
-      authUserRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("authUserService")
 
     await createAuthProviders(testManager)
     await createAuthUsers(testManager)

packages/authentication/package.json

@@ -11,8 +11,6 @@
     "node": ">=16"
   },
   "bin": {
-    "medusa-authentication-migrations-down": "dist/scripts/bin/run-migration-down.js",
-    "medusa-authentication-migrations-up": "dist/scripts/bin/run-migration-up.js",
     "medusa-authentication-seed": "dist/scripts/bin/run-seed.js"
   },
   "repository": {

packages/authentication/src/index.ts

@@ -1,7 +1,22 @@
 import { moduleDefinition } from "./module-definition"
+import { Modules } from "@medusajs/modules-sdk"
+import * as Models from "@models"
+import { ModulesSdkUtils } from "@medusajs/utils"
 
 export default moduleDefinition
 
+const migrationScriptOptions = {
+  moduleName: Modules.AUTHENTICATION,
+  models: Models,
+  pathToMigrations: __dirname + "/migrations",
+}
+
+export const runMigrations = ModulesSdkUtils.buildMigrationScript(
+  migrationScriptOptions
+)
+export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript(
+  migrationScriptOptions
+)
+
 export * from "./initialize"
 export * from "./loaders"
-export * from "./scripts"

packages/authentication/src/loaders/container.ts

@@ -1,48 +1,10 @@
-import * as defaultRepositories from "@repositories"
-import * as defaultServices from "@services"
-
-import { LoaderOptions } from "@medusajs/modules-sdk"
-import { ModulesSdkTypes } from "@medusajs/types"
-import { loadCustomRepositories } from "@medusajs/utils"
-import { asClass } from "awilix"
-
-export default async ({
-  container,
-  options,
-}: LoaderOptions<
-  | ModulesSdkTypes.ModuleServiceInitializeOptions
-  | ModulesSdkTypes.ModuleServiceInitializeCustomDataLayerOptions
->): Promise<void> => {
-  const customRepositories = (
-    options as ModulesSdkTypes.ModuleServiceInitializeCustomDataLayerOptions
-  )?.repositories
-
-  container.register({
-    authUserService: asClass(defaultServices.AuthUserService).singleton(),
-    authProviderService: asClass(
-      defaultServices.AuthProviderService
-    ).singleton(),
-  })
-
-  if (customRepositories) {
-    loadCustomRepositories({
-      defaultRepositories,
-      customRepositories,
-      container,
-    })
-  } else {
-    loadDefaultRepositories({ container })
-  }
-}
-
-function loadDefaultRepositories({ container }) {
-  container.register({
-    baseRepository: asClass(defaultRepositories.BaseRepository).singleton(),
-    authUserRepository: asClass(
-      defaultRepositories.AuthUserRepository
-    ).singleton(),
-    authProviderRepository: asClass(
-      defaultRepositories.AuthProviderRepository
-    ).singleton(),
-  })
-}
+import { ModulesSdkUtils } from "@medusajs/utils"
+import * as ModuleModels from "@models"
+import * as ModuleRepositories from "@repositories"
+import * as ModuleServices from "@services"
+
+export default ModulesSdkUtils.moduleContainerLoaderFactory({
+  moduleModels: ModuleModels,
+  moduleRepositories: ModuleRepositories,
+  moduleServices: ModuleServices,
+})

packages/authentication/src/repositories/index.ts

@@ -1,3 +1 @@
 export { MikroOrmBaseRepository as BaseRepository } from "@medusajs/utils"
-export { AuthProviderRepository } from "./auth-provider"
-export { AuthUserRepository } from "./auth-user"

packages/authentication/src/services/auth-user.ts

@@ -16,7 +16,7 @@ export default class AuthUserService<
     create: ServiceTypes.CreateAuthUserDTO
   }
 >(AuthUser)<TEntity> {
-  constructor({ authUserRepository }: InjectedDependencies) {
+  constructor(container: InjectedDependencies) {
     // @ts-ignore
     super(...arguments)
   }

packages/authentication/src/types/repositories/index.ts

@@ -1,2 +1,28 @@
+import { AuthProvider, AuthUser } from "@models"
+import { CreateAuthProviderDTO, UpdateAuthProviderDTO } from "./auth-provider"
+import { DAL } from "@medusajs/types"
+import { CreateAuthUserDTO, UpdateAuthUserDTO } from "./auth-user"
+
 export * from "./auth-user"
 export * from "./auth-provider"
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface IAuthProviderRepository<
+  TEntity extends AuthProvider = AuthProvider
+> extends DAL.RepositoryService<
+    TEntity,
+    {
+      create: CreateAuthProviderDTO
+      update: UpdateAuthProviderDTO
+    }
+  > {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface IAuthUserRepository<TEntity extends AuthUser = AuthUser>
+  extends DAL.RepositoryService<
+    TEntity,
+    {
+      create: CreateAuthUserDTO
+      update: UpdateAuthUserDTO
+    }
+  > {}