@mikro-orm/nestjs 5.2.1 → 5.2.3

package/mikro-orm-core.module.js

@@ -44,6 +44,7 @@ const mikro_orm_common_1 = require("./mikro-orm.common");
 const mikro_orm_providers_1 = require("./mikro-orm.providers");
 const mikro_orm_middleware_1 = require("./mikro-orm.middleware");
 const middleware_helper_1 = require("./middleware.helper");
+const mikro_orm_entities_storage_1 = require("./mikro-orm.entities.storage");
 async function tryRequire(name) {
     try {
         return await Promise.resolve(`${name}`).then(s => __importStar(require(s)));
@@ -52,7 +53,7 @@ async function tryRequire(name) {
         return undefined; // ignore, optional dependency
     }
 }
-let MikroOrmCoreModule = exports.MikroOrmCoreModule = MikroOrmCoreModule_1 = class MikroOrmCoreModule {
+let MikroOrmCoreModule = MikroOrmCoreModule_1 = class MikroOrmCoreModule {
     constructor(options, moduleRef) {
         this.options = options;
         this.moduleRef = moduleRef;
@@ -134,6 +135,7 @@ let MikroOrmCoreModule = exports.MikroOrmCoreModule = MikroOrmCoreModule_1 = cla
         const orm = this.moduleRef.get(token);
         if (orm) {
             await orm.close();
+            mikro_orm_entities_storage_1.MikroOrmEntitiesStorage.clearLater();
         }
         mikro_orm_common_1.CONTEXT_NAMES.length = 0;
     }
@@ -156,6 +158,7 @@ let MikroOrmCoreModule = exports.MikroOrmCoreModule = MikroOrmCoreModule_1 = cla
         return contextName;
     }
 };
+exports.MikroOrmCoreModule = MikroOrmCoreModule;
 exports.MikroOrmCoreModule = MikroOrmCoreModule = MikroOrmCoreModule_1 = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({}),

package/mikro-orm-middleware.module.js

@@ -18,7 +18,7 @@ const common_1 = require("@nestjs/common");
 const mikro_orm_common_1 = require("./mikro-orm.common");
 const multiple_mikro_orm_middleware_1 = require("./multiple-mikro-orm.middleware");
 const middleware_helper_1 = require("./middleware.helper");
-let MikroOrmMiddlewareModule = exports.MikroOrmMiddlewareModule = MikroOrmMiddlewareModule_1 = class MikroOrmMiddlewareModule {
+let MikroOrmMiddlewareModule = MikroOrmMiddlewareModule_1 = class MikroOrmMiddlewareModule {
     constructor(options) {
         this.options = options;
     }
@@ -46,6 +46,7 @@ let MikroOrmMiddlewareModule = exports.MikroOrmMiddlewareModule = MikroOrmMiddle
             .forRoutes({ path: (0, middleware_helper_1.forRoutesPath)(this.options, consumer), method: common_1.RequestMethod.ALL });
     }
 };
+exports.MikroOrmMiddlewareModule = MikroOrmMiddlewareModule;
 exports.MikroOrmMiddlewareModule = MikroOrmMiddlewareModule = MikroOrmMiddlewareModule_1 = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({}),

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

@@ -2,7 +2,14 @@ import type { AnyEntity } from '@mikro-orm/core';
 import type { EntityName } from './typings';
 export declare class MikroOrmEntitiesStorage {
     private static readonly storage;
+    private static shouldClear;
     static addEntity(entity: EntityName<AnyEntity>, contextName?: string): void;
     static getEntities(contextName?: string): never[] | IterableIterator<EntityName<Partial<any>>>;
     static clear(contextName?: string): void;
+    /**
+     * When the `addEntity` is called next, the storage will be cleared automatically before it.
+     * We want to keep the cache, as it's populated on require time, but sometimes (tests) the contexts could be cleared.
+     * This resolves both cases by deferring the `clear` call to the first `addEntity` call.
+     */
+    static clearLater(): void;
 }

package/mikro-orm.entities.storage.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MikroOrmEntitiesStorage = void 0;
 class MikroOrmEntitiesStorage {
     static addEntity(entity, contextName = 'default') {
+        if (this.shouldClear) {
+            this.clear(contextName);
+            this.shouldClear = false;
+        }
         let set = this.storage.get(contextName);
         if (!set) {
             set = new Set();
@@ -14,12 +18,17 @@ class MikroOrmEntitiesStorage {
         return this.storage.get(contextName)?.values() || [];
     }
     static clear(contextName = 'default') {
-        const set = this.storage.get(contextName);
-        if (!set) {
-            return;
-        }
-        set.clear();
+        this.storage.get(contextName)?.clear();
+    }
+    /**
+     * When the `addEntity` is called next, the storage will be cleared automatically before it.
+     * We want to keep the cache, as it's populated on require time, but sometimes (tests) the contexts could be cleared.
+     * This resolves both cases by deferring the `clear` call to the first `addEntity` call.
+     */
+    static clearLater() {
+        this.shouldClear = true;
     }
 }
 exports.MikroOrmEntitiesStorage = MikroOrmEntitiesStorage;
 MikroOrmEntitiesStorage.storage = new Map();
+MikroOrmEntitiesStorage.shouldClear = false;

package/mikro-orm.middleware.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MikroOrmMiddleware = void 0;
 const core_1 = require("@mikro-orm/core");
 const common_1 = require("@nestjs/common");
-let MikroOrmMiddleware = exports.MikroOrmMiddleware = class MikroOrmMiddleware {
+let MikroOrmMiddleware = class MikroOrmMiddleware {
     constructor(orm) {
         this.orm = orm;
     }
@@ -20,6 +20,7 @@ let MikroOrmMiddleware = exports.MikroOrmMiddleware = class MikroOrmMiddleware {
         core_1.RequestContext.create(this.orm.em, next);
     }
 };
+exports.MikroOrmMiddleware = MikroOrmMiddleware;
 exports.MikroOrmMiddleware = MikroOrmMiddleware = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.MikroORM])

package/mikro-orm.module.js

@@ -14,7 +14,7 @@ const mikro_orm_providers_1 = require("./mikro-orm.providers");
 const mikro_orm_core_module_1 = require("./mikro-orm-core.module");
 const mikro_orm_middleware_module_1 = require("./mikro-orm-middleware.module");
 const mikro_orm_entities_storage_1 = require("./mikro-orm.entities.storage");
-let MikroOrmModule = exports.MikroOrmModule = MikroOrmModule_1 = class MikroOrmModule {
+let MikroOrmModule = MikroOrmModule_1 = class MikroOrmModule {
     /**
      * Clears the entity storage. This is useful for testing purposes, when you want to isolate the tests.
      * Keep in mind that this should be called when using a test runner that keeps the context alive between tests (like Vitest with threads disabled).
@@ -56,6 +56,7 @@ let MikroOrmModule = exports.MikroOrmModule = MikroOrmModule_1 = class MikroOrmM
         };
     }
 };
+exports.MikroOrmModule = MikroOrmModule;
 exports.MikroOrmModule = MikroOrmModule = MikroOrmModule_1 = __decorate([
     (0, common_1.Module)({})
 ], MikroOrmModule);

package/mikro-orm.providers.js

@@ -31,7 +31,7 @@ function createEntityManagerProvider(scope = common_1.Scope.DEFAULT, entityManag
         return {
             provide: entityManager,
             scope,
-            useFactory: (em) => em,
+            useFactory: (em) => em, // just a simple alias, unlike `useExisting` from nest, this works with request scopes too
             inject: [core_1.EntityManager], // depend on the EM from core package
         };
     }

package/multiple-mikro-orm.middleware.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultipleMikroOrmMiddleware = void 0;
 const core_1 = require("@mikro-orm/core");
 const common_1 = require("@nestjs/common");
-let MultipleMikroOrmMiddleware = exports.MultipleMikroOrmMiddleware = class MultipleMikroOrmMiddleware {
+let MultipleMikroOrmMiddleware = class MultipleMikroOrmMiddleware {
     constructor(orm) {
         this.orm = orm;
     }
@@ -23,6 +23,7 @@ let MultipleMikroOrmMiddleware = exports.MultipleMikroOrmMiddleware = class Mult
         core_1.RequestContext.create(this.orm.map(orm => orm.em), next);
     }
 };
+exports.MultipleMikroOrmMiddleware = MultipleMikroOrmMiddleware;
 exports.MultipleMikroOrmMiddleware = MultipleMikroOrmMiddleware = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)('MikroORMs')),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/nestjs",
-  "version": "5.2.1",
+  "version": "5.2.3",
   "license": "MIT",
   "author": {
     "name": "Martin Adamek",
@@ -56,15 +56,15 @@
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "~5.61.0",
     "@typescript-eslint/parser": "~5.61.0",
-    "conventional-changelog": "^4.0.0",
-    "conventional-changelog-cli": "^3.0.0",
+    "conventional-changelog": "^5.0.0",
+    "conventional-changelog-cli": "^4.0.0",
     "eslint": "^8.43.0",
     "jest": "^29.5.0",
     "rxjs": "^7.8.1",
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "5.1.6"
+    "typescript": "5.3.3"
   },
   "commitlint": {
     "extends": [
@@ -104,5 +104,5 @@
   "engines": {
     "node": ">= 14.0.0"
   },
-  "packageManager": "yarn@3.6.1"
+  "packageManager": "yarn@4.0.2"
 }