@midwayjs/typeorm 3.11.5 → 3.11.8

package/dist/configuration.js

@@ -16,12 +16,26 @@ const dataSourceManager_1 = require("./dataSourceManager");
 const typeorm_1 = require("typeorm");
 let OrmConfiguration = class OrmConfiguration {
     async init() {
-        this.decoratorService.registerPropertyHandler(decorator_1.ORM_MODEL_KEY, (propertyName, meta) => {
-            return this.dataSourceManager
-                .getDataSource(meta.connectionName ||
+        this.decoratorService.registerPropertyHandler(decorator_1.ORM_MODEL_KEY, (propertyName, meta, instance) => {
+            const dataSource = this.dataSourceManager.getDataSource(meta.connectionName ||
                 this.dataSourceManager.getDataSourceNameByModel(meta.modelKey) ||
-                this.dataSourceManager.getDefaultDataSourceName())
-                .getRepository(meta.modelKey);
+                this.dataSourceManager.getDefaultDataSourceName());
+            if (!dataSource) {
+                throw new core_1.MidwayCommonError(`DataSource ${meta.connectionName} not found with current model ${meta.modelKey}, please check it.`);
+            }
+            const type = (0, core_1.getPropertyType)(instance, propertyName);
+            if (type.originDesign === typeorm_1.Repository) {
+                return dataSource.getRepository(meta.modelKey);
+            }
+            else if (type.originDesign === typeorm_1.TreeRepository) {
+                return dataSource.getTreeRepository(meta.modelKey);
+            }
+            else if (type.originDesign === typeorm_1.MongoRepository) {
+                return dataSource.getMongoRepository(meta.modelKey);
+            }
+            else {
+                return dataSource.getRepository(meta.modelKey);
+            }
         });
         this.decoratorService.registerPropertyHandler(decorator_1.ORM_DATA_SOURCE_KEY, (propertyName, meta) => {
             return this.dataSourceManager.getDataSource(meta.dataSourceName ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/typeorm",
-  "version": "3.11.5",
+  "version": "3.11.8",
   "main": "dist/index",
   "typings": "index.d.ts",
   "bin": {
@@ -13,10 +13,10 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.11.4",
-    "@midwayjs/mock": "^3.11.5",
+    "@midwayjs/core": "^3.11.6",
+    "@midwayjs/mock": "^3.11.6",
     "sqlite3": "5.1.6",
-    "typeorm": "0.3.15"
+    "typeorm": "0.3.16"
   },
   "author": {
     "name": "czy88840616",
@@ -35,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "a2c3b25f840a2e9dc01bfb7ef4bef82c3a4b0dcf"
+  "gitHead": "65e2ca5c92c065c7e73565880562823e00f8e4f4"
 }