@midwayjs/mikro 3.15.2 → 3.15.3

package/dist/configuration.js

@@ -29,12 +29,13 @@ let MikroConfiguration = class MikroConfiguration {
             }
         });
         this.decoratorService.registerPropertyHandler(decorator_1.ENTITY_MANAGER_KEY, (propertyName, meta) => {
-            if (core_2.RequestContext.getEntityManager()) {
-                return core_2.RequestContext.getEntityManager();
+            const name = meta.connectionName ||
+                this.dataSourceManager.getDefaultDataSourceName();
+            if (core_2.RequestContext.getEntityManager(name)) {
+                return core_2.RequestContext.getEntityManager(name);
             }
             else {
-                return this.dataSourceManager.getDataSource(meta.connectionName ||
-                    this.dataSourceManager.getDefaultDataSourceName()).em;
+                return this.dataSourceManager.getDataSource(name).em;
             }
         });
         this.decoratorService.registerPropertyHandler(decorator_1.DATA_SOURCE_KEY, (propertyName, meta) => {
@@ -44,6 +45,26 @@ let MikroConfiguration = class MikroConfiguration {
     }
     async onReady(container) {
         this.dataSourceManager = await container.getAsync(dataSourceManager_1.MikroDataSourceManager);
+        const names = this.dataSourceManager.getDataSourceNames();
+        const entityManagers = names.map(name => {
+            return this.dataSourceManager.getDataSource(name).em;
+        });
+        if (names.length > 0) {
+            // create mikro request scope
+            // https://mikro-orm.io/docs/identity-map
+            this.applicationManager.getApplications().forEach(app => {
+                app.useMiddleware(async (ctx, next) => {
+                    if (core_2.RequestContext['createAsync']) {
+                        // mikro-orm 5.x
+                        return await core_2.RequestContext['createAsync'](entityManagers, next);
+                    }
+                    else {
+                        // mikro-orm 6.x
+                        return await core_2.RequestContext.create(entityManagers, next);
+                    }
+                });
+            });
+        }
     }
     async onStop(container) {
         if (this.dataSourceManager) {

package/dist/dataSourceManager.js

@@ -20,12 +20,18 @@ let MikroDataSourceManager = class MikroDataSourceManager extends core_1.DataSou
         return 'mikro';
     }
     async createDataSource(config, dataSourceName) {
+        var _a;
         if (config.logger && typeof config.logger === 'string') {
             const logger = this.loggerService.getLogger(config.logger);
             config.logger = message => {
                 logger.info(message);
             };
         }
+        // https://mikro-orm.io/docs/usage-with-nestjs#multiple-database-connections
+        if (!config.contextName) {
+            config.contextName = dataSourceName;
+        }
+        config.registerRequestContext = (_a = config.registerRequestContext) !== null && _a !== void 0 ? _a : false;
         return core_2.MikroORM.init(config);
     }
     async checkConnected(dataSource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mikro",
-  "version": "3.15.2",
+  "version": "3.15.3",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -12,9 +12,9 @@
     "@midwayjs/core": "^3.15.0",
     "@midwayjs/koa": "^3.15.2",
     "@midwayjs/mock": "^3.15.2",
-    "@mikro-orm/core": "6.1.8",
-    "@mikro-orm/entity-generator": "6.1.8",
-    "@mikro-orm/sqlite": "6.1.8"
+    "@mikro-orm/core": "6.1.10",
+    "@mikro-orm/entity-generator": "6.1.10",
+    "@mikro-orm/sqlite": "6.1.10"
   },
   "author": {
     "name": "czy88840616",
@@ -33,5 +33,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "e8b53689c50aa8c9a691de7d985cafd62f5f70e7"
+  "gitHead": "5d2dd74111b1b28d9bbf2cd533306119e3b58dce"
 }