@midwayjs/mikro 3.13.9 → 3.14.3

package/dist/configuration.js

@@ -53,7 +53,14 @@ let MikroConfiguration = class MikroConfiguration {
             // https://mikro-orm.io/docs/identity-map
             this.applicationManager.getApplications().forEach(app => {
                 app.useMiddleware(async (ctx, next) => {
-                    return await core_2.RequestContext.createAsync(entityManagers, 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);
+                    }
                 });
             });
         }

package/dist/dataSourceManager.d.ts

@@ -1,8 +1,9 @@
-import { DataSourceManager } from '@midwayjs/core';
+import { DataSourceManager, MidwayLoggerService } from '@midwayjs/core';
 import { MikroORM, IDatabaseDriver, Connection } from '@mikro-orm/core';
 export declare class MikroDataSourceManager extends DataSourceManager<MikroORM<IDatabaseDriver<Connection>>> {
     mikroConfig: any;
     baseDir: string;
+    loggerService: MidwayLoggerService;
     init(): Promise<void>;
     getName(): string;
     protected createDataSource(config: any, dataSourceName: string): Promise<MikroORM<IDatabaseDriver<Connection>>>;

package/dist/dataSourceManager.js

@@ -20,6 +20,12 @@ let MikroDataSourceManager = class MikroDataSourceManager extends core_1.DataSou
         return 'mikro';
     }
     async createDataSource(config, dataSourceName) {
+        if (config.logger && typeof config.logger === 'string') {
+            const logger = this.loggerService.getLogger(config.logger);
+            config.logger = message => {
+                logger.info(message);
+            };
+        }
         return core_2.MikroORM.init(config);
     }
     async checkConnected(dataSource) {
@@ -39,6 +45,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", String)
 ], MikroDataSourceManager.prototype, "baseDir", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", core_1.MidwayLoggerService)
+], MikroDataSourceManager.prototype, "loggerService", void 0);
 __decorate([
     (0, core_1.Init)(),
     __metadata("design:type", Function),

package/dist/interface.d.ts

@@ -1,4 +1,6 @@
 import { Options, Configuration, IDatabaseDriver } from '@mikro-orm/core';
 import { DataSourceManagerConfigOption } from '@midwayjs/core';
-export type MikroConfigOptions<D extends IDatabaseDriver = IDatabaseDriver> = DataSourceManagerConfigOption<Options<D> | Configuration<D>>;
+export type MikroConfigOptions<D extends IDatabaseDriver = IDatabaseDriver> = DataSourceManagerConfigOption<(Options<D> | Configuration<D>) & {
+    logger?: string | ((message: string) => void);
+}>;
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mikro",
-  "version": "3.13.9",
+  "version": "3.14.3",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -9,13 +9,11 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.13.7",
-    "@midwayjs/mock": "^3.13.9",
-    "@mikro-orm/core": "5.9.6",
-    "@mikro-orm/entity-generator": "5.9.6",
-    "@mikro-orm/sql-highlighter": "1.0.1",
-    "@mikro-orm/sqlite": "5.9.6",
-    "sqlite3": "5.1.6"
+    "@midwayjs/core": "^3.14.3",
+    "@midwayjs/mock": "^3.14.3",
+    "@mikro-orm/core": "6.0.4",
+    "@mikro-orm/entity-generator": "6.0.4",
+    "@mikro-orm/sqlite": "6.0.4"
   },
   "author": {
     "name": "czy88840616",
@@ -34,5 +32,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "00750219506f4e3ad0e1dbb167d295610005b328"
+  "gitHead": "7517e708722bbf9ba69d9406e73fa2597e485d24"
 }