@midwayjs/mikro 3.4.0-beta.2 → 3.4.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,7 +18,8 @@ let MikroConfiguration = class MikroConfiguration {
18
18
  async init() {
19
19
  this.decoratorService.registerPropertyHandler(decorator_2.ENTITY_MODEL_KEY, (propertyName, meta) => {
20
20
  return this.dataSourceManager
21
- .getDataSource(meta.connectionName)
21
+ .getDataSource(meta.connectionName ||
22
+ this.dataSourceManager.getDataSourceNameByModel(meta.modelKey))
22
23
  .em.getRepository(meta.modelKey);
23
24
  });
24
25
  }
@@ -2,6 +2,7 @@ import { DataSourceManager } from '@midwayjs/core';
2
2
  import { MikroORM, IDatabaseDriver, Connection } from '@mikro-orm/core';
3
3
  export declare class MikroDataSourceManager extends DataSourceManager<MikroORM<IDatabaseDriver<Connection>>> {
4
4
  mikroConfig: any;
5
+ baseDir: string;
5
6
  init(): Promise<void>;
6
7
  getName(): string;
7
8
  protected createDataSource(config: any, dataSourceName: string): Promise<MikroORM<IDatabaseDriver<Connection>>>;
@@ -15,7 +15,7 @@ const core_1 = require("@midwayjs/core");
15
15
  const core_2 = require("@mikro-orm/core");
16
16
  let MikroDataSourceManager = class MikroDataSourceManager extends core_1.DataSourceManager {
17
17
  async init() {
18
- await this.initDataSource(this.mikroConfig);
18
+ await this.initDataSource(this.mikroConfig, this.baseDir);
19
19
  }
20
20
  getName() {
21
21
  return 'mikro';
@@ -36,6 +36,10 @@ __decorate([
36
36
  (0, decorator_1.Config)('mikro'),
37
37
  __metadata("design:type", Object)
38
38
  ], MikroDataSourceManager.prototype, "mikroConfig", void 0);
39
+ __decorate([
40
+ (0, decorator_1.Inject)(),
41
+ __metadata("design:type", String)
42
+ ], MikroDataSourceManager.prototype, "baseDir", void 0);
39
43
  __decorate([
40
44
  (0, decorator_1.Init)(),
41
45
  __metadata("design:type", Function),
@@ -1,3 +1,4 @@
1
+ import { EntityName } from '@mikro-orm/core';
1
2
  export declare const ENTITY_MODEL_KEY = "mikro:entity_model_key";
2
- export declare function InjectRepository(modelKey: any, connectionName?: string): PropertyDecorator;
3
+ export declare function InjectRepository(modelKey: EntityName<any>, connectionName?: string): PropertyDecorator;
3
4
  //# sourceMappingURL=decorator.d.ts.map
package/dist/decorator.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.InjectRepository = exports.ENTITY_MODEL_KEY = void 0;
4
4
  const decorator_1 = require("@midwayjs/decorator");
5
5
  exports.ENTITY_MODEL_KEY = 'mikro:entity_model_key';
6
- function InjectRepository(modelKey, connectionName = 'default') {
6
+ function InjectRepository(modelKey, connectionName) {
7
7
  return (0, decorator_1.createCustomPropertyDecorator)(exports.ENTITY_MODEL_KEY, {
8
8
  modelKey,
9
9
  connectionName,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@midwayjs/mikro",
3
- "version": "3.4.0-beta.2",
3
+ "version": "3.4.0-beta.5",
4
4
  "main": "dist/index",
5
5
  "typings": "index.d.ts",
6
6
  "files": [
@@ -9,13 +9,13 @@
9
9
  "index.d.ts"
10
10
  ],
11
11
  "devDependencies": {
12
- "@midwayjs/core": "^3.4.0-beta.2",
13
- "@midwayjs/decorator": "^3.4.0-beta.2",
14
- "@midwayjs/mock": "^3.4.0-beta.2",
15
- "@mikro-orm/core": "5.2.0",
16
- "@mikro-orm/entity-generator": "5.2.0",
12
+ "@midwayjs/core": "^3.4.0-beta.5",
13
+ "@midwayjs/decorator": "^3.4.0-beta.5",
14
+ "@midwayjs/mock": "^3.4.0-beta.5",
15
+ "@mikro-orm/core": "5.2.2",
16
+ "@mikro-orm/entity-generator": "5.2.2",
17
17
  "@mikro-orm/sql-highlighter": "1.0.1",
18
- "@mikro-orm/sqlite": "5.2.0",
18
+ "@mikro-orm/sqlite": "5.2.2",
19
19
  "sqlite3": "5.0.8"
20
20
  },
21
21
  "author": {
@@ -35,5 +35,5 @@
35
35
  "type": "git",
36
36
  "url": "http://github.com/midwayjs/midway.git"
37
37
  },
38
- "gitHead": "a61721d3946b30fd4cac183265edcd99b31ac72b"
38
+ "gitHead": "d84d1c77aed1fd973d002ab65cd0adeadb7924a6"
39
39
  }