@mikro-orm/nestjs 5.1.0 → 5.1.1

package/mikro-orm.common.d.ts

@@ -1,5 +1,5 @@
-import type { EntityName } from '@mikro-orm/core';
 import { Logger } from '@nestjs/common';
+import type { EntityName } from './typings';
 export declare const MIKRO_ORM_MODULE_OPTIONS: unique symbol;
 export declare const CONTEXT_NAMES: string[];
 export declare const logger: Logger;
@@ -7,5 +7,5 @@ export declare const getMikroORMToken: (name: string) => string;
 export declare const InjectMikroORM: (name: string) => (target: object, key: string | symbol, index?: number | undefined) => void;
 export declare const getEntityManagerToken: (name: string) => string;
 export declare const InjectEntityManager: (name: string) => (target: object, key: string | symbol, index?: number | undefined) => void;
-export declare const getRepositoryToken: <T>(entity: EntityName<T>, name?: string | undefined) => string;
-export declare const InjectRepository: <T>(entity: EntityName<T>, name?: string | undefined) => (target: object, key: string | symbol, index?: number | undefined) => void;
+export declare const getRepositoryToken: <T>(entity: EntityName<T>, name?: string) => string;
+export declare const InjectRepository: <T>(entity: EntityName<T>, name?: string) => (target: object, key: string | symbol, index?: number | undefined) => void;

package/mikro-orm.entities.storage.d.ts

@@ -1,4 +1,5 @@
-import type { AnyEntity, EntityName } from '@mikro-orm/core';
+import type { AnyEntity } from '@mikro-orm/core';
+import type { EntityName } from './typings';
 export declare class MikroOrmEntitiesStorage {
     private static readonly storage;
     static addEntity(entity: EntityName<AnyEntity>, contextName?: string): void;

package/mikro-orm.module.d.ts

@@ -1,6 +1,6 @@
-import type { AnyEntity, EntityName } from '@mikro-orm/core';
+import type { AnyEntity } from '@mikro-orm/core';
 import type { DynamicModule } from '@nestjs/common';
-import type { MikroOrmModuleAsyncOptions, MikroOrmModuleSyncOptions, MikroOrmMiddlewareModuleOptions, MikroOrmModuleFeatureOptions } from './typings';
+import type { MikroOrmModuleAsyncOptions, MikroOrmModuleSyncOptions, MikroOrmMiddlewareModuleOptions, MikroOrmModuleFeatureOptions, EntityName } from './typings';
 export declare class MikroOrmModule {
     static forRoot(options?: MikroOrmModuleSyncOptions): DynamicModule;
     static forRootAsync(options: MikroOrmModuleAsyncOptions): DynamicModule;

package/mikro-orm.providers.d.ts

@@ -1,6 +1,6 @@
-import type { AnyEntity, EntityName } from '@mikro-orm/core';
+import type { AnyEntity } from '@mikro-orm/core';
 import { EntityManager } from '@mikro-orm/core';
-import type { MikroOrmModuleAsyncOptions } from './typings';
+import type { MikroOrmModuleAsyncOptions, EntityName } from './typings';
 import type { Provider, Type } from '@nestjs/common';
 import { Scope } from '@nestjs/common';
 export declare function createMikroOrmProvider(contextName?: string): Provider;

package/mikro-orm.providers.js

@@ -27,6 +27,14 @@ function createMikroOrmProvider(contextName) {
 }
 exports.createMikroOrmProvider = createMikroOrmProvider;
 function createEntityManagerProvider(scope = common_1.Scope.DEFAULT, entityManager = core_1.EntityManager, contextName) {
+    if (!contextName && entityManager !== core_1.EntityManager) {
+        return {
+            provide: entityManager,
+            scope,
+            useFactory: (em) => em,
+            inject: [core_1.EntityManager], // depend on the EM from core package
+        };
+    }
     return {
         provide: contextName ? (0, mikro_orm_common_1.getEntityManagerToken)(contextName) : entityManager,
         scope,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/nestjs",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "license": "MIT",
   "author": {
     "name": "Martin Adamek",
@@ -66,8 +66,8 @@
     "@types/jest": "^28.0.0",
     "@types/node": "^17.0.17",
     "@types/supertest": "^2.0.11",
-    "@typescript-eslint/eslint-plugin": "~5.26.0",
-    "@typescript-eslint/parser": "~5.26.0",
+    "@typescript-eslint/eslint-plugin": "~5.33.0",
+    "@typescript-eslint/parser": "~5.33.0",
     "conventional-changelog": "^3.1.25",
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^8.9.0",
@@ -76,7 +76,7 @@
     "supertest": "^6.2.2",
     "ts-jest": "^28.0.0",
     "ts-node": "^10.5.0",
-    "typescript": "4.6.4"
+    "typescript": "4.7.4"
   },
   "commitlint": {
     "extends": [

package/typings.d.ts

@@ -1,4 +1,4 @@
-import type { AnyEntity, EntityName, IDatabaseDriver, Options } from '@mikro-orm/core';
+import type { AnyEntity, EntityName as CoreEntityName, EntitySchema, IDatabaseDriver, Options } from '@mikro-orm/core';
 import type { MiddlewareConsumer, ModuleMetadata, Scope, Type } from '@nestjs/common';
 import type { AbstractHttpAdapter } from '@nestjs/core';
 export interface NestMiddlewareConsumer extends MiddlewareConsumer {
@@ -37,4 +37,5 @@ export interface MikroOrmModuleAsyncOptions<D extends IDatabaseDriver = IDatabas
     useFactory?: (...args: any[]) => Promise<Omit<MikroOrmModuleOptions<D>, 'contextName'>> | Omit<MikroOrmModuleOptions<D>, 'contextName'>;
     inject?: any[];
 }
+export declare type EntityName<T extends AnyEntity<T>> = CoreEntityName<T> | EntitySchema<any>;
 export {};