@diyaner/egg-typeorm 2.1.0 → 2.2.0

package/lib/EggDataSource.d.ts

@@ -11,8 +11,8 @@ export declare class EggDataSource extends DataSource {
      *
      * - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
      */
-    addEntity<T extends Function>(clz: T): Promise<this>;
-    /** 一个实体类来构建元数据 */
+    addEntity<T extends Function>(classes: T): Promise<this>;
+    /** 一个实体类来构建元数据，这个只适合无关联关系的单个类，表 */
     private buildMetaData2;
     /** 移除一个ds上的某个类实体 */
     removeEntity<T extends Function>(clz: T): void;

package/lib/EggDataSource.js

@@ -20,16 +20,29 @@ class EggDataSource extends typeorm_1.DataSource {
      *
      * - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
      */
-    async addEntity(clz) {
-        const entityCacheClz = this.customAddEntityCacheMap.get(clz);
+    async addEntity(classes) {
+        const entityCacheClz = this.customAddEntityCacheMap.get(classes);
         if (entityCacheClz) {
             return this;
         }
-        await this.buildMetaData2(clz);
-        this.customAddEntityCacheMap.set(clz, true);
+        // 因typeorm底层实现需要所有entities一起解析实现关联关系。因此只能全部entities重新build
+        let existedEntities = this.options.entities;
+        if (!existedEntities) {
+            existedEntities = [];
+        }
+        if (Array.isArray(existedEntities)) {
+            existedEntities.push(classes);
+        }
+        else {
+            existedEntities[classes.name] = classes;
+        }
+        await this.buildMetadatas(); // 与连接初始化时一致，根据所有实体类构建元数据。添加单个实体这里调用，将会很费性能，且可能由于关联关系问题报错。
+        // 不全部重新build，只单个类，但又无法实现关联关系
+        // await this.buildMetaData2(classes);
+        this.customAddEntityCacheMap.set(classes, true);
         return this;
     }
-    /** 一个实体类来构建元数据 */
+    /** 一个实体类来构建元数据，这个只适合无关联关系的单个类，表 */
     async buildMetaData2(entity) {
         const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
         const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
@@ -56,7 +69,7 @@ class EggDataSource extends typeorm_1.DataSource {
             // @ts-ignore
             metadata.target.dataSource = null;
         }
-        // @ts-ignore
+        // @ts-ignore entityMetadatas 是只读属性
         this.entityMetadatas = this.entityMetadatas.filter((item) => item.target !== clz);
         this.entityMetadatasMap.delete(clz);
     }
@@ -67,4 +80,4 @@ class EggDataSource extends typeorm_1.DataSource {
     }
 }
 exports.EggDataSource = EggDataSource;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUNBQW1FO0FBQ25FLDRGQUF5RjtBQUN6Riw4RkFBMkY7QUFDM0YsMERBQTBEO0FBRTFEOztHQUVHO0FBQ0gsTUFBYSxhQUFjLFNBQVEsb0JBQVU7SUFBN0M7O1FBQ1MsNEJBQXVCLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7SUE2RDdELENBQUM7SUEzREE7Ozs7OztPQU1HO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsR0FBTTtRQUN6QyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsdUJBQXVCLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdELElBQUksY0FBYyxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDYixDQUFDO1FBRUQsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVDLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUVELGtCQUFrQjtJQUNWLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBZ0I7UUFDNUMsTUFBTSx5QkFBeUIsR0FBRyxJQUFJLHFEQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRTlELHlCQUF5QjtRQUN6QixNQUFNLGVBQWUsR0FBRyxNQUFNLHlCQUF5QixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUN2RixLQUFLLE1BQU0sUUFBUSxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQ3hDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN4RCxDQUFDO1FBRUQsaUdBQWlHO1FBQ2pHLHVCQUF1QixDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRW5FLDBDQUEwQztRQUMxQyxLQUFLLElBQUksY0FBYyxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQzVDLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztnQkFDcEUsY0FBYyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDM0MsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0lBRUQsb0JBQW9CO0lBQ3BCLFlBQVksQ0FBcUIsR0FBTTtRQUN0QyxJQUFJLENBQUMsdUJBQXVCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEQsSUFBSSxRQUFRLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztZQUMxRSxhQUFhO1lBQ2IsUUFBUSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ25DLENBQUM7UUFDRCxhQUFhO1FBQ2IsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQztRQUNsRixJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCwrQkFBK0I7SUFDL0IsS0FBSyxDQUFDLE1BQU0sQ0FBVSxLQUFhLEVBQUUsVUFBK0IsRUFBRSxXQUF5QjtRQUM5RixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLHlCQUF5QixDQUFDLEtBQUssRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDNUUsT0FBTyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUM3RCxDQUFDO0NBQ0Q7QUE5REQsc0NBOERDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUNBQW1FO0FBQ25FLDRGQUF5RjtBQUN6Riw4RkFBMkY7QUFDM0YsMERBQTBEO0FBRTFEOztHQUVHO0FBQ0gsTUFBYSxhQUFjLFNBQVEsb0JBQVU7SUFBN0M7O1FBQ1MsNEJBQXVCLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7SUE2RTdELENBQUM7SUEzRUE7Ozs7OztPQU1HO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsT0FBVTtRQUM3QyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsdUJBQXVCLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2pFLElBQUksY0FBYyxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDYixDQUFDO1FBRUQsMkRBQTJEO1FBQzNELElBQUksZUFBZSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDO1FBRTVDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN0QixlQUFlLEdBQUcsRUFBRSxDQUFBO1FBQ3JCLENBQUM7UUFFRCxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxlQUFlLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzlCLENBQUM7YUFBTSxDQUFDO1lBQ1AsZUFBZSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUM7UUFDekMsQ0FBQztRQUVELE1BQU0sSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUMsMERBQTBEO1FBRXZGLDZCQUE2QjtRQUM3QixzQ0FBc0M7UUFDdEMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDaEQsT0FBTyxJQUFJLENBQUM7SUFDYixDQUFDO0lBRUQsbUNBQW1DO0lBQzNCLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBZ0I7UUFDNUMsTUFBTSx5QkFBeUIsR0FBRyxJQUFJLHFEQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRTlELHlCQUF5QjtRQUN6QixNQUFNLGVBQWUsR0FBRyxNQUFNLHlCQUF5QixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUN2RixLQUFLLE1BQU0sUUFBUSxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQ3hDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN4RCxDQUFDO1FBRUQsaUdBQWlHO1FBQ2pHLHVCQUF1QixDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRW5FLDBDQUEwQztRQUMxQyxLQUFLLElBQUksY0FBYyxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQzVDLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztnQkFDcEUsY0FBYyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDM0MsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0lBRUQsb0JBQW9CO0lBQ3BCLFlBQVksQ0FBcUIsR0FBTTtRQUN0QyxJQUFJLENBQUMsdUJBQXVCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEQsSUFBSSxRQUFRLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztZQUMxRSxhQUFhO1lBQ2IsUUFBUSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ25DLENBQUM7UUFDRCxtQ0FBbUM7UUFDbkMsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQztRQUNsRixJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCwrQkFBK0I7SUFDL0IsS0FBSyxDQUFDLE1BQU0sQ0FBVSxLQUFhLEVBQUUsVUFBK0IsRUFBRSxXQUF5QjtRQUM5RixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLHlCQUF5QixDQUFDLEtBQUssRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDNUUsT0FBTyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUM3RCxDQUFDO0NBQ0Q7QUE5RUQsc0NBOEVDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diyaner/egg-typeorm",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "egg plugin for nodejs orm freamwork typeorm.",
   "eggPlugin": {
     "name": "typeorm"

package/typeorm.js

@@ -5,4 +5,4 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("typeorm"), exports);
 var EggDataSource_1 = require("./lib/EggDataSource");
 Object.defineProperty(exports, "EggDataSource", { enumerable: true, get: function () { return EggDataSource_1.EggDataSource; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBIn0=