@diyaner/egg-typeorm 3.0.1 → 3.1.1

package/app/entity/pluginsEntity/UserEntity.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const typeorm_1 = require("@ginreo/typeorm");
+let UserEntity = class UserEntity {
+};
+tslib_1.__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    tslib_1.__metadata("design:type", Number)
+], UserEntity.prototype, "id", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], UserEntity.prototype, "abcd", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", Number)
+], UserEntity.prototype, "userId", void 0);
+UserEntity = tslib_1.__decorate([
+    (0, typeorm_1.Entity)("user_of_plugin_dir")
+], UserEntity);
+exports.default = UserEntity;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckVudGl0eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlVzZXJFbnRpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQStGO0FBR2hGLElBQU0sVUFBVSxHQUFoQixNQUFNLFVBQVU7Q0FTOUIsQ0FBQTtBQVBBO0lBREMsSUFBQSxnQ0FBc0IsR0FBRTs7c0NBQ2Q7QUFHWDtJQURDLElBQUEsZ0JBQU0sRUFBQyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQzs7d0NBQ2Q7QUFHYjtJQURDLElBQUEsZ0JBQU0sR0FBRTs7MENBQ007QUFSSyxVQUFVO0lBRDlCLElBQUEsZ0JBQU0sRUFBQyxvQkFBb0IsQ0FBQztHQUNSLFVBQVUsQ0FTOUI7a0JBVG9CLFVBQVUifQ==

package/index.d.ts

@@ -18,8 +18,8 @@ declare module "egg" {
 	/** typeorm 已弃用name属性，暂时加上 */
 	type EggConfigTypeormDataSourceOptions = {
 		name?: string;
-		/** 实体类所在目录名 */
-		entityDir?: string;
+		/** 实体类所在目录名 支持多个目录，多个目录时需手动添加同名name属性的目录 */
+		entityDir?: string | string[];
 	} & typeorm.DataSourceOptions;
 	interface EggAppConfig {
 		/** typeorm 数据库连接配置 */

package/lib/EggDataSource.d.ts

@@ -1,4 +1,4 @@
-import { DataSource, EntityManager, EntityTarget, ObjectLiteral } from "@ginreo/typeorm";
+import { DataSource, EntityTarget, ObjectLiteral } from "@ginreo/typeorm";
 /**
  * custom extend typeorm's DataSource class
  */
@@ -33,13 +33,6 @@ export declare class EggDataSource extends DataSource {
     removeEntity<T extends Function>(clz: T): this;
     /** 通过用户表名或内部生成表名删除一个实体 仅限egg自定义添加的实体 */
     removeEntityByTableName(tableName: string): this;
-    /** query方法增强
-     * - 支持查询语句转义 :params
-     * - 支持传入事务manager
-     */
-    query2<T = any>(query: string, parameters?: Record<string, any>, options?: {
-        manager?: EntityManager;
-    }): Promise<T>;
     /** 使用一个现有entity进行模型分表
      * - 注意，同一个分表entity不应反复调用，否则产生多个相同class，造成OOM
      * - 原始实体必须已经存在在datasource中，否则会报错

package/lib/EggDataSource.js

@@ -216,17 +216,6 @@ class EggDataSource extends typeorm_1.DataSource {
     // 	}
     // 	return result as T;
     // }
-    /** query方法增强
-     * - 支持查询语句转义 :params
-     * - 支持传入事务manager
-     */
-    async query2(query, parameters, options) {
-        var _a, _b;
-        const [sql, params] = this.driver.escapeQueryWithParameters(query, parameters || {}, {});
-        const queryRunner = ((_a = options === null || options === void 0 ? void 0 : options.manager) === null || _a === void 0 ? void 0 : _a.queryRunner) || ((_b = this.manager) === null || _b === void 0 ? void 0 : _b.queryRunner);
-        const result = await super.query2(sql, params, queryRunner);
-        return result;
-    }
     /** 使用一个现有entity进行模型分表
      * - 注意，同一个分表entity不应反复调用，否则产生多个相同class，造成OOM
      * - 原始实体必须已经存在在datasource中，否则会报错
@@ -402,4 +391,4 @@ class EggDataSource extends typeorm_1.DataSource {
     }
 }
 exports.EggDataSource = EggDataSource;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}

package/lib/connection.js

@@ -17,11 +17,17 @@ async function default_1(app) {
     if (config.length > 1) {
         // console.log("多个数据库配置");
         config.forEach((item, index) => {
-            let entityDirName = item.entityDir || item.name; // 取配置中的实体目录属性或name属性
-            assert.ok(entityDirName, `Error, connection need a unique entityDir or name for relate entity dir. ${item.host}`);
-            entityDirName = entityDirName.replace(/[._-]/gi, "").toUpperCase(); // 此处是为与loader中的目录名对应。（其目录名有转换，不实等真实名）
-            // @ts-ignore 每个连接只使用自己的子目录实体
-            item.entities = [...(entities.dirs[entityDirName] || [])];
+            let entityDirName1 = item.entityDir || item.name; // 取配置中的实体目录属性或name属性
+            assert.ok(entityDirName1, `Error, connection need a unique entityDir or name for relate entity dir. ${item.host}`);
+            const entityDirList = Array.isArray(entityDirName1) ? entityDirName1 : [entityDirName1];
+            const myEntities = [];
+            // 20260309 支持一个连接多个实体目录
+            entityDirList.forEach((entityDirName) => {
+                entityDirName = entityDirName.replace(/[._-]/gi, "").toUpperCase(); // 此处是为与loader中的目录名对应。（其目录名有转换，不实等真实名）
+                myEntities.push(...(entities.dirs[entityDirName] || []));
+            });
+            // @ts-ignore 每个连接使用自己的子目录实体
+            item.entities = myEntities;
             // 第一个连接还需要加上首层的实体
             if (index === 0) {
                 // @ts-ignore
@@ -77,4 +83,4 @@ async function createTypeORMDataSources(app, datasourcesConfig, entities) {
     }
     throw new Error(util.format(`[Egg-TypeORM] the DB %s %s %s init connection was failed after retry 3 times.`, datasourcesConfig.host, datasourcesConfig.port, datasourcesConfig.name));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFXQSw0QkE2Q0M7QUFFRCw0REEyQ0M7QUFwR0QsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFXQSw0QkFtRUM7QUFFRCw0REErQ0M7QUE5SEQsNkJBQTZCO0FBRzdCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxjQUFjLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBRXZFLE1BQU0sQ0FBQyxFQUFFLENBQ1IsY0FBYyxFQUNkLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQ2hHLENBQUM7WUFDRixNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUM7WUFFeEYsTUFBTSxVQUFVLEdBQVUsRUFBRSxDQUFDO1lBQzdCLHdCQUF3QjtZQUN4QixhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsYUFBYSxFQUFFLEVBQUU7Z0JBQ3ZDLGFBQWEsR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLFNBQVMs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

package/lib/loader.js

@@ -2,14 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 exports.default = async (app) => {
-    const dir = path.join(app.config.baseDir, "app/entity");
     app.typeorm.entites = app.typeorm.entites || {
         dirs: {},
         all: [],
         level1: [],
     };
     const entitys = app.typeorm.entites;
-    app.loader.loadToApp(dir, "entity", {
+    const units = app.loader.getLoadUnits();
+    // console.log(app.config.baseDir);
+    // console.log(units);
+    // const unitsDirs = path.join(app.config.baseDir, "app/entity");
+    const unitsDirs = units.map((u) => path.join(u.path, "app/entity"));
+    // todo 测试加载units下的实体
+    app.loader.loadToApp(unitsDirs, "entity", {
         caseStyle: "upper",
         // 要求加载的全部都是default export 类/函数
         initializer(Clz, opt) {
@@ -36,4 +41,4 @@ exports.default = async (app) => {
         },
     });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNkJBQTZCO0FBRTdCLGtCQUFlLEtBQUssRUFBRSxHQUF3QixFQUFFLEVBQUU7SUFDakQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN4RCxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSTtRQUM1QyxJQUFJLEVBQUUsRUFBRTtRQUNSLEdBQUcsRUFBRSxFQUFFO1FBQ1AsTUFBTSxFQUFFLEVBQUU7S0FDVixDQUFDO0lBQ0YsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFFcEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtRQUNuQyxTQUFTLEVBQUUsT0FBTztRQUNsQiwrQkFBK0I7UUFDL0IsV0FBVyxDQUFDLEdBQUcsRUFBRSxHQUFHO1lBQ25CLGFBQWE7WUFDYixHQUFHLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztZQUNkLG9CQUFvQjtZQUNwQixvQkFBb0I7WUFDcEIseUNBQXlDO1lBQ3pDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQzNDLDJCQUEyQjtZQUUzQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN0QixVQUFVO1lBQ1YsSUFBSSxVQUFVLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO2dCQUM3QixPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUMxQixDQUFDO2lCQUFNLElBQUksVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDbEMsWUFBWTtnQkFDWix3Q0FBd0M7Z0JBQ3hDLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDNUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDcEQsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakMsQ0FBQztZQUVELE9BQU8sR0FBRyxDQUFDO1FBQ1osQ0FBQztLQUNELENBQUMsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNkJBQTZCO0FBRTdCLGtCQUFlLEtBQUssRUFBRSxHQUF3QixFQUFFLEVBQUU7SUFDakQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLElBQUk7UUFDNUMsSUFBSSxFQUFFLEVBQUU7UUFDUixHQUFHLEVBQUUsRUFBRTtRQUNQLE1BQU0sRUFBRSxFQUFFO0tBQ1YsQ0FBQztJQUNGLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO0lBRXBDLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDeEMsbUNBQW1DO0lBQ25DLHNCQUFzQjtJQUV0QixpRUFBaUU7SUFDakUsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7SUFDcEUscUJBQXFCO0lBQ3JCLEdBQUcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxRQUFRLEVBQUU7UUFDekMsU0FBUyxFQUFFLE9BQU87UUFDbEIsK0JBQStCO1FBQy9CLFdBQVcsQ0FBQyxHQUFHLEVBQUUsR0FBRztZQUNuQixhQUFhO1lBQ2IsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7WUFDZCxvQkFBb0I7WUFDcEIsb0JBQW9CO1lBQ3BCLHlDQUF5QztZQUN6QyxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUMzQywyQkFBMkI7WUFFM0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDdEIsVUFBVTtZQUNWLElBQUksVUFBVSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDN0IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDMUIsQ0FBQztpQkFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQ2xDLFlBQVk7Z0JBQ1osd0NBQXdDO2dCQUN4QyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7Z0JBQzVDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3BELE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pDLENBQUM7WUFFRCxPQUFPLEdBQUcsQ0FBQztRQUNaLENBQUM7S0FDRCxDQUFDLENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diyaner/egg-typeorm",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "egg plugin for nodejs orm freamwork typeorm.",
   "eggPlugin": {
     "name": "typeorm"
@@ -43,7 +43,8 @@
     "lint": "eslint .",
     "ci": "egg-bin pkgfiles --check && npm run lint && npm run cov",
     "pkgfiles": "egg-bin pkgfiles",
-    "autod": "autod"
+    "autod": "autod",
+    "ets": "ets"
   },
   "files": [
     "app.js",