@midwayjs/mikro 3.4.0-beta.4 → 3.4.0-beta.7

package/dist/configuration.d.ts

@@ -1,8 +1,9 @@
-import { ILifeCycle, IMidwayApplication, IMidwayContainer, MidwayDecoratorService } from '@midwayjs/core';
+import { ILifeCycle, IMidwayApplication, IMidwayContainer, MidwayApplicationManager, MidwayDecoratorService } from '@midwayjs/core';
 import { MikroDataSourceManager } from './dataSourceManager';
 export declare class MikroConfiguration implements ILifeCycle {
     app: IMidwayApplication;
     decoratorService: MidwayDecoratorService;
+    applicationManager: MidwayApplicationManager;
     dataSourceManager: MikroDataSourceManager;
     init(): Promise<void>;
     onReady(container: IMidwayContainer): Promise<void>;

package/dist/configuration.js

@@ -14,17 +14,34 @@ const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
 const decorator_2 = require("./decorator");
 const dataSourceManager_1 = require("./dataSourceManager");
+const core_2 = require("@mikro-orm/core");
 let MikroConfiguration = class MikroConfiguration {
     async init() {
         this.decoratorService.registerPropertyHandler(decorator_2.ENTITY_MODEL_KEY, (propertyName, meta) => {
-            return this.dataSourceManager
-                .getDataSource(meta.connectionName ||
-                this.dataSourceManager.getDataSourceNameByModel(meta.modelKey))
-                .em.getRepository(meta.modelKey);
+            if (core_2.RequestContext.getEntityManager()) {
+                return core_2.RequestContext.getEntityManager().getRepository(meta.modelKey);
+            }
+            else {
+                return this.dataSourceManager
+                    .getDataSource(meta.connectionName ||
+                    this.dataSourceManager.getDataSourceNameByModel(meta.modelKey))
+                    .em.getRepository(meta.modelKey);
+            }
         });
     }
     async onReady(container) {
         this.dataSourceManager = await container.getAsync(dataSourceManager_1.MikroDataSourceManager);
+        const names = this.dataSourceManager.getDataSourceNames();
+        if (names.length === 1) {
+            // 多个的话，不知道用哪个数据源，所以这里无法判断出来
+            // create mikro request scope
+            // https://mikro-orm.io/docs/identity-map
+            this.applicationManager.getApplications().forEach(app => {
+                app.useMiddleware(async (ctx, next) => {
+                    return await core_2.RequestContext.createAsync(this.dataSourceManager.getDataSource(names[0]).em, next);
+                });
+            });
+        }
     }
     async onStop(container) {
         if (this.dataSourceManager) {
@@ -40,6 +57,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], MikroConfiguration.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayApplicationManager)
+], MikroConfiguration.prototype, "applicationManager", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mikro",
-  "version": "3.4.0-beta.4",
+  "version": "3.4.0-beta.7",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -9,13 +9,13 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.4.0-beta.4",
-    "@midwayjs/decorator": "^3.4.0-beta.4",
-    "@midwayjs/mock": "^3.4.0-beta.4",
-    "@mikro-orm/core": "5.2.0",
-    "@mikro-orm/entity-generator": "5.2.0",
+    "@midwayjs/core": "^3.4.0-beta.7",
+    "@midwayjs/decorator": "^3.4.0-beta.7",
+    "@midwayjs/mock": "^3.4.0-beta.7",
+    "@mikro-orm/core": "5.2.2",
+    "@mikro-orm/entity-generator": "5.2.2",
     "@mikro-orm/sql-highlighter": "1.0.1",
-    "@mikro-orm/sqlite": "5.2.0",
+    "@mikro-orm/sqlite": "5.2.2",
     "sqlite3": "5.0.8"
   },
   "author": {
@@ -35,5 +35,5 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "3b686101f7802f87d47b8c9d25561339d556e573"
+  "gitHead": "4d5cc59a7a33e49beeaf20fcfaf766438649959c"
 }