@midwayjs/typeorm 4.0.0-alpha.1 → 4.0.0-beta.2

package/dist/configuration.js

@@ -71,7 +71,9 @@ exports.OrmConfiguration = OrmConfiguration = __decorate([
         importConfigs: [
             {
                 default: {
-                    typeorm: {},
+                    typeorm: {
+                        allowExecuteMigrations: false,
+                    },
                     midwayLogger: {
                         clients: {
                             typeormLogger: {

package/dist/dataSourceManager.d.ts

@@ -1,9 +1,9 @@
 import { DataSourceManager, IMidwayContainer, MidwayLoggerService } from '@midwayjs/core';
 import { DataSource } from 'typeorm';
+import { typeormConfigOptions } from './interface';
 export declare class TypeORMDataSourceManager extends DataSourceManager<DataSource> {
-    typeormConfig: any;
+    typeormConfig: typeormConfigOptions;
     applicationContext: IMidwayContainer;
-    baseDir: string;
     loggerService: MidwayLoggerService;
     init(): Promise<void>;
     getName(): string;

package/dist/dataSourceManager.js

@@ -15,19 +15,30 @@ const typeorm_1 = require("typeorm");
 const logger_1 = require("./logger");
 let TypeORMDataSourceManager = class TypeORMDataSourceManager extends core_1.DataSourceManager {
     async init() {
-        await this.initDataSource(this.typeormConfig, this.baseDir);
+        await this.initDataSource(this.typeormConfig, {
+            concurrent: true,
+        });
     }
     getName() {
         return 'typeorm';
     }
     async createDataSource(config, dataSourceName) {
-        if (config['migrations']) {
-            delete config['migrations'];
+        if (!this.typeormConfig['allowExecuteMigrations']) {
+            if (config['migrations']) {
+                delete config['migrations'];
+            }
         }
         if (config['logging'] === undefined) {
             config['logger'] = new logger_1.TypeORMLogger(this.loggerService.getLogger('typeormLogger'));
         }
-        const dataSource = new typeorm_1.DataSource(config);
+        const { customDataSourceClass, ...otherConfig } = config;
+        let dataSource;
+        if (customDataSourceClass) {
+            dataSource = new customDataSourceClass(otherConfig);
+        }
+        else {
+            dataSource = new typeorm_1.DataSource(otherConfig);
+        }
         await dataSource.initialize();
         return dataSource;
     }
@@ -49,10 +60,6 @@ __decorate([
     (0, core_1.ApplicationContext)(),
     __metadata("design:type", Object)
 ], TypeORMDataSourceManager.prototype, "applicationContext", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", String)
-], TypeORMDataSourceManager.prototype, "baseDir", void 0);
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayLoggerService)

package/dist/interface.d.ts

@@ -1,4 +1,6 @@
 import { DataSourceOptions } from 'typeorm';
 import { DataSourceManagerConfigOption } from '@midwayjs/core';
-export type typeormConfigOptions = DataSourceManagerConfigOption<DataSourceOptions>;
+export type typeormConfigOptions = DataSourceManagerConfigOption<DataSourceOptions> & {
+    allowExecuteMigrations: boolean;
+};
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/typeorm",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.2",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "bin": {
@@ -13,8 +13,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-alpha.1",
-    "@midwayjs/mock": "^4.0.0-alpha.1",
+    "@midwayjs/core": "^4.0.0-beta.2",
+    "@midwayjs/mock": "^4.0.0-beta.2",
     "sqlite3": "5.1.7",
     "typeorm": "0.3.20"
   },
@@ -23,7 +23,7 @@
     "email": "czy88840616@gmail.com"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
   "license": "MIT",
   "scripts": {
@@ -35,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "53bfef4c5279da5f09025e4610bdbf64f94f60bd"
 }