@diyaner/egg-typeorm 2.2.0 → 2.3.1

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.
package/index.d.ts CHANGED
@@ -41,9 +41,13 @@ declare module "egg" {
41
41
  /** 绑定实体类列表 */
42
42
  entites: {
43
43
  all: any[];
44
- // 第一层中直接定义的实体,直接附加给第一个连接。(因为把第一个连接作为默认主连接数据库)
44
+ /**
45
+ * 第一层中直接定义的实体,直接附加给第一个连接。(因为把第一个连接作为默认主连接数据库)
46
+ */
45
47
  level1: any[];
46
- // 按第一层文件夹区分的实体,是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
48
+ /** 按第一层文件夹区分的实体,是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
49
+ * - 目录名转为大写,如abc -> ABC
50
+ */
47
51
  dirs: {
48
52
  [key: string]: any[];
49
53
  };
@@ -3,19 +3,34 @@ import { DataSource, QueryRunner } from "typeorm";
3
3
  * custom extend typeorm's DataSource class
4
4
  */
5
5
  export declare class EggDataSource extends DataSource {
6
- private customAddEntityCacheMap;
6
+ private eggCustomAddEntityCacheMap;
7
+ /** 分表添加实体缓存map */
8
+ private eggCustomAddSplitEntityCacheMap;
7
9
  /**
8
- * 在一个typeorm连接datasource实例上动态添加一个实体及其metadata
10
+ * 在一个typeorm连接datasource实例上动态添加一个实体类及其metadata
11
+ * - 可以实现动态分表,同一实体类的子类,改表名就能对应多个db表等场景
12
+ * - 注意:不能在每个请求之中重复添加相同功能的类,否则可能造成OOM;应该在app全局上统一获取单例类
13
+ * - 类上可定义属性name2,处理源码被压缩情况下类名丢失问题
14
+ */
15
+ addEntity<T extends Function>(classes: T): Promise<this>;
16
+ /**
17
+ * 在一个typeorm连接datasource实例上动态添加一个或多个实体类及其metadata
9
18
  *
10
- * - 可以实现动态分表
19
+ * - 可以实现动态分表,同一实体类的子类,改表名就能对应多个db表等场景
11
20
  *
12
21
  * - 注意:不能在每个请求之中重复添加相同功能的类,否则可能造成OOM;应该在app全局上统一获取单例类
13
22
  */
14
- addEntity<T extends Function>(classes: T): Promise<this>;
23
+ addEntities<T extends Function>(...classess: T[]): Promise<this>;
15
24
  /** 一个实体类来构建元数据,这个只适合无关联关系的单个类,表 */
16
25
  private buildMetaData2;
17
26
  /** 移除一个ds上的某个类实体 */
18
27
  removeEntity<T extends Function>(clz: T): void;
19
28
  /** query方法,支持查询语句转义 :params */
20
29
  query2<T = any>(query: string, parameters: Record<string, any>, queryRunner?: QueryRunner): Promise<T>;
30
+ /** 使用一个现有entity进行模型分表
31
+ * - 注意,同一个分表entity不应反复调用,否则产生多个相同class,造成OOM
32
+ * - 原始实体必须已经存在在datasource中,否则会报错
33
+ * - 与原始实体不同的是,它关联的toOne实体身上并未关联本实体(还是关联的原始实体),因此查询时不能使用oneToMany关系关联本实体的数据。只能本实体为主查询
34
+ */
35
+ getSplitTableEntity<T extends Function>(clz: T, tableName: string, isSubfix?: boolean): Promise<T>;
21
36
  }
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EggDataSource = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const typeorm_1 = require("typeorm");
5
6
  const ConnectionMetadataBuilder_1 = require("typeorm/connection/ConnectionMetadataBuilder");
6
7
  const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetadataValidator");
@@ -11,20 +12,29 @@ const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetada
11
12
  class EggDataSource extends typeorm_1.DataSource {
12
13
  constructor() {
13
14
  super(...arguments);
14
- this.customAddEntityCacheMap = new Map();
15
+ this.eggCustomAddEntityCacheMap = new Map();
16
+ /** 分表添加实体缓存map */
17
+ this.eggCustomAddSplitEntityCacheMap = new Map();
15
18
  }
16
19
  /**
17
- * 在一个typeorm连接datasource实例上动态添加一个实体及其metadata
18
- *
19
- * - 可以实现动态分表
20
- *
20
+ * 在一个typeorm连接datasource实例上动态添加一个实体类及其metadata
21
+ * - 可以实现动态分表,同一实体类的子类,改表名就能对应多个db表等场景
21
22
  * - 注意:不能在每个请求之中重复添加相同功能的类,否则可能造成OOM;应该在app全局上统一获取单例类
23
+ * - 类上可定义属性name2,处理源码被压缩情况下类名丢失问题
22
24
  */
23
25
  async addEntity(classes) {
24
- const entityCacheClz = this.customAddEntityCacheMap.get(classes);
26
+ const entityCacheClz = this.eggCustomAddEntityCacheMap.get(classes);
25
27
  if (entityCacheClz) {
26
28
  return this;
27
29
  }
30
+ // @ts-ignore name2 for 源码压缩场景,可重新定义类名
31
+ if (classes.name2) {
32
+ Object.defineProperty(classes, "name", {
33
+ writable: true,
34
+ });
35
+ // @ts-ignore
36
+ classes.name = classes.name2;
37
+ }
28
38
  // 因typeorm底层实现需要所有entities一起解析实现关联关系。因此只能全部entities重新build
29
39
  let existedEntities = this.options.entities;
30
40
  if (!existedEntities) {
@@ -39,7 +49,22 @@ class EggDataSource extends typeorm_1.DataSource {
39
49
  await this.buildMetadatas(); // 与连接初始化时一致,根据所有实体类构建元数据。添加单个实体这里调用,将会很费性能,且可能由于关联关系问题报错。
40
50
  // 不全部重新build,只单个类,但又无法实现关联关系
41
51
  // await this.buildMetaData2(classes);
42
- this.customAddEntityCacheMap.set(classes, true);
52
+ this.eggCustomAddEntityCacheMap.set(classes, true);
53
+ return this;
54
+ }
55
+ /**
56
+ * 在一个typeorm连接datasource实例上动态添加一个或多个实体类及其metadata
57
+ *
58
+ * - 可以实现动态分表,同一实体类的子类,改表名就能对应多个db表等场景
59
+ *
60
+ * - 注意:不能在每个请求之中重复添加相同功能的类,否则可能造成OOM;应该在app全局上统一获取单例类
61
+ */
62
+ async addEntities(...classess) {
63
+ for (const classes of classess) {
64
+ await this.addEntity(classes);
65
+ }
66
+ // 不全部重新build,只单个类,但又无法实现关联关系
67
+ // await this.buildMetaData2(classes);
43
68
  return this;
44
69
  }
45
70
  /** 一个实体类来构建元数据,这个只适合无关联关系的单个类,表 */
@@ -63,7 +88,7 @@ class EggDataSource extends typeorm_1.DataSource {
63
88
  }
64
89
  /** 移除一个ds上的某个类实体 */
65
90
  removeEntity(clz) {
66
- this.customAddEntityCacheMap.delete(clz);
91
+ this.eggCustomAddEntityCacheMap.delete(clz);
67
92
  const metadata = this.entityMetadatasMap.get(clz);
68
93
  if (metadata && typeorm_1.InstanceChecker.isBaseEntityConstructor(metadata.target)) {
69
94
  // @ts-ignore
@@ -78,6 +103,30 @@ class EggDataSource extends typeorm_1.DataSource {
78
103
  const result = this.driver.escapeQueryWithParameters(query, parameters, {});
79
104
  return await super.query(result[0], result[1], queryRunner);
80
105
  }
106
+ /** 使用一个现有entity进行模型分表
107
+ * - 注意,同一个分表entity不应反复调用,否则产生多个相同class,造成OOM
108
+ * - 原始实体必须已经存在在datasource中,否则会报错
109
+ * - 与原始实体不同的是,它关联的toOne实体身上并未关联本实体(还是关联的原始实体),因此查询时不能使用oneToMany关系关联本实体的数据。只能本实体为主查询
110
+ */
111
+ async getSplitTableEntity(clz, tableName, isSubfix = false) {
112
+ const meta = this.getMetadata(clz);
113
+ if (!meta)
114
+ throw new Error(`entity ${clz.name} not found in datasource ${this.name}`);
115
+ const name = isSubfix ? `${meta.givenTableName || meta.name || clz.name}_${tableName}` : tableName;
116
+ const CacheClasses = this.eggCustomAddSplitEntityCacheMap.get(name);
117
+ if (CacheClasses) {
118
+ return CacheClasses;
119
+ }
120
+ let Classes = class Classes extends clz {
121
+ };
122
+ Classes = tslib_1.__decorate([
123
+ (0, typeorm_1.Entity)({ name, comment: meta.comment || "" })
124
+ ], Classes);
125
+ Classes.name2 = name;
126
+ await this.addEntity(Classes);
127
+ this.eggCustomAddSplitEntityCacheMap.set(name, Classes);
128
+ return Classes;
129
+ }
81
130
  }
82
131
  exports.EggDataSource = EggDataSource;
83
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUNBQW1FO0FBQ25FLDRGQUF5RjtBQUN6Riw4RkFBMkY7QUFDM0YsMERBQTBEO0FBRTFEOztHQUVHO0FBQ0gsTUFBYSxhQUFjLFNBQVEsb0JBQVU7SUFBN0M7O1FBQ1MsNEJBQXVCLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7SUE2RTdELENBQUM7SUEzRUE7Ozs7OztPQU1HO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsT0FBVTtRQUM3QyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsdUJBQXVCLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2pFLElBQUksY0FBYyxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDYixDQUFDO1FBRUQsMkRBQTJEO1FBQzNELElBQUksZUFBZSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDO1FBRTVDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN0QixlQUFlLEdBQUcsRUFBRSxDQUFBO1FBQ3JCLENBQUM7UUFFRCxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxlQUFlLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzlCLENBQUM7YUFBTSxDQUFDO1lBQ1AsZUFBZSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUM7UUFDekMsQ0FBQztRQUVELE1BQU0sSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUMsMERBQTBEO1FBRXZGLDZCQUE2QjtRQUM3QixzQ0FBc0M7UUFDdEMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDaEQsT0FBTyxJQUFJLENBQUM7SUFDYixDQUFDO0lBRUQsbUNBQW1DO0lBQzNCLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBZ0I7UUFDNUMsTUFBTSx5QkFBeUIsR0FBRyxJQUFJLHFEQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRTlELHlCQUF5QjtRQUN6QixNQUFNLGVBQWUsR0FBRyxNQUFNLHlCQUF5QixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUN2RixLQUFLLE1BQU0sUUFBUSxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQ3hDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN4RCxDQUFDO1FBRUQsaUdBQWlHO1FBQ2pHLHVCQUF1QixDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRW5FLDBDQUEwQztRQUMxQyxLQUFLLElBQUksY0FBYyxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQzVDLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztnQkFDcEUsY0FBYyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDM0MsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0lBRUQsb0JBQW9CO0lBQ3BCLFlBQVksQ0FBcUIsR0FBTTtRQUN0QyxJQUFJLENBQUMsdUJBQXVCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEQsSUFBSSxRQUFRLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztZQUMxRSxhQUFhO1lBQ2IsUUFBUSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ25DLENBQUM7UUFDRCxtQ0FBbUM7UUFDbkMsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQztRQUNsRixJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCwrQkFBK0I7SUFDL0IsS0FBSyxDQUFDLE1BQU0sQ0FBVSxLQUFhLEVBQUUsVUFBK0IsRUFBRSxXQUF5QjtRQUM5RixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLHlCQUF5QixDQUFDLEtBQUssRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDNUUsT0FBTyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUM3RCxDQUFDO0NBQ0Q7QUE5RUQsc0NBOEVDIn0=
132
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLHFDQUEyRTtBQUMzRSw0RkFBeUY7QUFDekYsOEZBQTJGO0FBQzNGLDBEQUEwRDtBQUUxRDs7R0FFRztBQUNILE1BQWEsYUFBYyxTQUFRLG9CQUFVO0lBQTdDOztRQUNTLCtCQUEwQixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO1FBQy9ELGtCQUFrQjtRQUNWLG9DQUErQixHQUFHLElBQUksR0FBRyxFQUFvQixDQUFDO0lBMkh2RSxDQUFDO0lBMUhBOzs7OztPQUtHO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsT0FBVTtRQUM3QyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3BFLElBQUksY0FBYyxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDYixDQUFDO1FBRUQsc0NBQXNDO1FBQ3RDLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25CLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRTtnQkFDdEMsUUFBUSxFQUFFLElBQUk7YUFDZCxDQUFDLENBQUM7WUFDSCxhQUFhO1lBQ2IsT0FBTyxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO1FBQzlCLENBQUM7UUFFRCwyREFBMkQ7UUFDM0QsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFFNUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3RCLGVBQWUsR0FBRyxFQUFFLENBQUM7UUFDdEIsQ0FBQztRQUVELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQ3BDLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7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
package/lib/Logger.js CHANGED
@@ -10,13 +10,13 @@ class EggTypeORMLogger {
10
10
  };
11
11
  }
12
12
  logQuery(query, parameters, _queryRunner) {
13
- this.app.coreLogger.debug(`[egg-typeorm Logger] %s \r\n%j`, query, parameters);
13
+ this.app.coreLogger.debug(`[Egg-TypeORM logQuery] %s \r\n%j`, query, parameters);
14
14
  }
15
15
  logQueryError(error, query, parameters, _queryRunner) {
16
- this.app.coreLogger.error(`%s\r\n%s\r\n%j`, query, error, parameters);
16
+ this.app.coreLogger.error(`[Egg-TypeORM logQueryError] %s\r\n%s\r\n%j`, query, error, parameters);
17
17
  }
18
18
  logQuerySlow(time, query, parameters, _queryRunner) {
19
- this.app.coreLogger.warn(`[egg-typeorm Logger slow sql] %s \r\n%s \r\n%j`, time, query, parameters);
19
+ this.app.coreLogger.warn(`[Egg-TypeORM SLOW SQL] %s \r\n%s \r\n%j`, time, query, parameters);
20
20
  }
21
21
  // @ts-ignore
22
22
  logSchemaBuild(message, queryRunner) {
@@ -26,11 +26,9 @@ class EggTypeORMLogger {
26
26
  logMigration(message, queryRunner) {
27
27
  // throw new Error("Method not implemented.");
28
28
  }
29
- // @ts-ignore
30
29
  log(level, message, queryRunner) {
31
- // throw new Error("Method not implemented.");
32
30
  this.app.logger[this.loggerMap[level]](message);
33
31
  }
34
32
  }
35
33
  exports.default = EggTypeORMLogger;
36
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQXdCO1FBQXhCLFFBQUcsR0FBSCxHQUFHLENBQXFCO1FBb0I1QyxjQUFTLEdBQUc7WUFDWCxHQUFHLEVBQUUsTUFBTTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osSUFBSSxFQUFFLE1BQU07U0FDWixDQUFDO0lBeEI2QyxDQUFDO0lBQ2hELFFBQVEsQ0FBQyxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUM3RixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0NBQWdDLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2hGLENBQUM7SUFDRCxhQUFhLENBQUMsS0FBcUIsRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUN6SCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBQ0QsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUMvRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0RBQWdELEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNyRyxDQUFDO0lBRUQsYUFBYTtJQUNiLGNBQWMsQ0FBQyxPQUFlLEVBQUUsV0FBcUM7UUFDcEUsOENBQThDO0lBQy9DLENBQUM7SUFDRCxhQUFhO0lBQ2IsWUFBWSxDQUFDLE9BQWUsRUFBRSxXQUFxQztRQUNsRSw4Q0FBOEM7SUFDL0MsQ0FBQztJQVFELGFBQWE7SUFDYixHQUFHLENBQUMsS0FBOEIsRUFBRSxPQUFZLEVBQUUsV0FBcUM7UUFDdEYsOENBQThDO1FBQzlDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNqRCxDQUFDO0NBQ0Q7QUFoQ0QsbUNBZ0NDIn0=
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQXdCO1FBQXhCLFFBQUcsR0FBSCxHQUFHLENBQXFCO1FBb0I1QyxjQUFTLEdBQUc7WUFDWCxHQUFHLEVBQUUsTUFBTTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osSUFBSSxFQUFFLE1BQU07U0FDWixDQUFDO0lBeEI2QyxDQUFDO0lBQ2hELFFBQVEsQ0FBQyxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUM3RixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsa0NBQWtDLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFDRCxhQUFhLENBQUMsS0FBcUIsRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUN6SCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsNENBQTRDLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNuRyxDQUFDO0lBQ0QsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUMvRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMseUNBQXlDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUM5RixDQUFDO0lBRUQsYUFBYTtJQUNiLGNBQWMsQ0FBQyxPQUFlLEVBQUUsV0FBcUM7UUFDcEUsOENBQThDO0lBQy9DLENBQUM7SUFDRCxhQUFhO0lBQ2IsWUFBWSxDQUFDLE9BQWUsRUFBRSxXQUFxQztRQUNsRSw4Q0FBOEM7SUFDL0MsQ0FBQztJQVFELEdBQUcsQ0FBQyxLQUE4QixFQUFFLE9BQVksRUFBRSxXQUFxQztRQUN0RixJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakQsQ0FBQztDQUNEO0FBOUJELG1DQThCQyJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@diyaner/egg-typeorm",
3
- "version": "2.2.0",
3
+ "version": "2.3.1",
4
4
  "description": "egg plugin for nodejs orm freamwork typeorm.",
5
5
  "eggPlugin": {
6
6
  "name": "typeorm"