@midwayjs/typeorm 3.4.0-beta.3 → 3.4.0-beta.6

package/dist/configuration.js

@@ -19,7 +19,8 @@ let OrmConfiguration = class OrmConfiguration {
     async init() {
         this.decoratorService.registerPropertyHandler(decorator_2.ORM_MODEL_KEY, (propertyName, meta) => {
             return this.dataSourceManager
-                .getDataSource(meta.connectionName)
+                .getDataSource(meta.connectionName ||
+                this.dataSourceManager.getDataSourceNameByModel(meta.modelKey))
                 .getRepository(meta.modelKey);
         });
     }

package/dist/dataSourceManager.d.ts

@@ -3,6 +3,7 @@ import { DataSource } from 'typeorm';
 export declare class TypeORMDataSourceManager extends DataSourceManager<DataSource> {
     typeormConfig: any;
     applicationContext: IMidwayContainer;
+    baseDir: string;
     init(): Promise<void>;
     getName(): string;
     protected createDataSource(config: any, dataSourceName: string): Promise<DataSource>;

package/dist/dataSourceManager.js

@@ -15,7 +15,7 @@ const core_1 = require("@midwayjs/core");
 const typeorm_1 = require("typeorm");
 let TypeORMDataSourceManager = class TypeORMDataSourceManager extends core_1.DataSourceManager {
     async init() {
-        await this.initDataSource(this.typeormConfig);
+        await this.initDataSource(this.typeormConfig, this.baseDir);
     }
     getName() {
         return 'typeorm';
@@ -42,6 +42,10 @@ __decorate([
     (0, decorator_1.ApplicationContext)(),
     __metadata("design:type", Object)
 ], TypeORMDataSourceManager.prototype, "applicationContext", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", String)
+], TypeORMDataSourceManager.prototype, "baseDir", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),

package/dist/decorator.d.ts

@@ -1,7 +1,8 @@
+import { EntityTarget } from 'typeorm';
 export declare const ENTITY_MODEL_KEY = "typeorm:entity_model_key";
 export declare const EVENT_SUBSCRIBER_KEY = "typeorm:event_subscriber_key";
 export declare const ORM_MODEL_KEY = "typeorm:orm_model_key";
-export declare function InjectEntityModel(modelKey: any, connectionName?: string): PropertyDecorator;
+export declare function InjectEntityModel(modelKey: EntityTarget<unknown>, connectionName?: string): PropertyDecorator;
 /**
  * EventSubscriber - typeorm
  * implements EntitySubscriberInterface

package/dist/decorator.js

@@ -6,7 +6,7 @@ const typeorm_1 = require("typeorm");
 exports.ENTITY_MODEL_KEY = 'typeorm:entity_model_key';
 exports.EVENT_SUBSCRIBER_KEY = 'typeorm:event_subscriber_key';
 exports.ORM_MODEL_KEY = 'typeorm:orm_model_key';
-function InjectEntityModel(modelKey, connectionName = 'default') {
+function InjectEntityModel(modelKey, connectionName) {
     return (0, decorator_1.createCustomPropertyDecorator)(exports.ORM_MODEL_KEY, {
         modelKey,
         connectionName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/typeorm",
-  "version": "3.4.0-beta.3",
+  "version": "3.4.0-beta.6",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -9,9 +9,9 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.4.0-beta.3",
-    "@midwayjs/decorator": "^3.4.0-beta.3",
-    "@midwayjs/mock": "^3.4.0-beta.3",
+    "@midwayjs/core": "^3.4.0-beta.6",
+    "@midwayjs/decorator": "^3.4.0-beta.6",
+    "@midwayjs/mock": "^3.4.0-beta.6",
     "sqlite3": "5.0.8",
     "typeorm": "0.3.7"
   },
@@ -32,5 +32,5 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "ddbff5c3da5d908953cc691a8e5de4f0197de365"
+  "gitHead": "8e187c4593d4832de32b6745af3e195f6b90816c"
 }