@diyaner/egg-typeorm 1.0.1 → 2.0.1

package/README.md

@@ -1,75 +1,75 @@
-# egg-ts-template
-
-[![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![Test coverage][codecov-image]][codecov-url]
-[![David deps][david-image]][david-url]
-[![Known Vulnerabilities][snyk-image]][snyk-url]
-[![npm download][download-image]][download-url]
-
-[npm-image]: https://img.shields.io/npm/v/egg-ts-template.svg?style=flat-square
-[npm-url]: https://npmjs.org/package/egg-ts-template
-[travis-image]: https://img.shields.io/travis/eggjs/egg-ts-template.svg?style=flat-square
-[travis-url]: https://travis-ci.org/eggjs/egg-ts-template
-[codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-ts-template.svg?style=flat-square
-[codecov-url]: https://codecov.io/github/eggjs/egg-ts-template?branch=master
-[david-image]: https://img.shields.io/david/eggjs/egg-ts-template.svg?style=flat-square
-[david-url]: https://david-dm.org/eggjs/egg-ts-template
-[snyk-image]: https://snyk.io/test/npm/egg-ts-template/badge.svg?style=flat-square
-[snyk-url]: https://snyk.io/test/npm/egg-ts-template
-[download-image]: https://img.shields.io/npm/dm/egg-ts-template.svg?style=flat-square
-[download-url]: https://npmjs.org/package/egg-ts-template
-
-<!--
-Description here.
--->
-
-## Install
-
-```bash
-$ npm i @diyaner/egg-typeorm --save
-```
-
-## Usage
-
-```js
-// {app_root}/config/plugin.js
-exports.typeorm = {
-  enable: true,
-  package: '@diyaner/egg-typeorm',
-};
-```
-
-## Configuration
-
-```js
-// {app_root}/config/config.default.js
-exports.typeorm = {
-  agent:true,
-  datasources:[
-    {...}
-  ]
-};
-```
-
-see [config/config.default.js](config/config.default.js) for more detail.
-
-## Example
-
-<!-- example here -->
-- 实体entity放在app/entity目录下
-- 实体必须使用默认default导出，这样才能正确使用ets自动类型声明并绑定给app.entity
-- 实体default导出，同时还是必须要设置class的类名，否则typeorm无法正确解析设置数据库表名
-- 如果有多个连接，则每个连接必须提供name属性，且唯一。name也是entity下的子目录区分。这是entity目录下直接实体将挂在第一个数据库配置连接上。比如连接2使用db2，则entity目录下db2目录下的entity才会绑定给这个连接。
-- 如果单个连接，则所有实体entity都会挂在这个连接上，不会按二级目录区分。
-
-
-
-
-## Questions & Suggestions
-
-Please open an issue [here](https://github.com/eggjs/egg/issues).
-
-## License
-
-[MIT](LICENSE)
+# egg-ts-template
+
+[![NPM version][npm-image]][npm-url]
+[![build status][travis-image]][travis-url]
+[![Test coverage][codecov-image]][codecov-url]
+[![David deps][david-image]][david-url]
+[![Known Vulnerabilities][snyk-image]][snyk-url]
+[![npm download][download-image]][download-url]
+
+[npm-image]: https://img.shields.io/npm/v/egg-ts-template.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/egg-ts-template
+[travis-image]: https://img.shields.io/travis/eggjs/egg-ts-template.svg?style=flat-square
+[travis-url]: https://travis-ci.org/eggjs/egg-ts-template
+[codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-ts-template.svg?style=flat-square
+[codecov-url]: https://codecov.io/github/eggjs/egg-ts-template?branch=master
+[david-image]: https://img.shields.io/david/eggjs/egg-ts-template.svg?style=flat-square
+[david-url]: https://david-dm.org/eggjs/egg-ts-template
+[snyk-image]: https://snyk.io/test/npm/egg-ts-template/badge.svg?style=flat-square
+[snyk-url]: https://snyk.io/test/npm/egg-ts-template
+[download-image]: https://img.shields.io/npm/dm/egg-ts-template.svg?style=flat-square
+[download-url]: https://npmjs.org/package/egg-ts-template
+
+<!--
+Description here.
+-->
+
+## Install
+
+```bash
+$ npm i @diyaner/egg-typeorm --save
+```
+
+## Usage
+
+```js
+// {app_root}/config/plugin.js
+exports.typeorm = {
+  enable: true,
+  package: '@diyaner/egg-typeorm',
+};
+```
+
+## Configuration
+
+```js
+// {app_root}/config/config.default.js
+exports.typeorm = {
+  agent:true,
+  datasources:[
+    {...}
+  ]
+};
+```
+
+see [config/config.default.js](config/config.default.js) for more detail.
+
+## Example
+
+<!-- example here -->
+- 实体entity放在app/entity目录下
+- 实体必须使用默认default导出，这样才能正确使用ets自动类型声明并绑定给app.entity
+- 实体default导出，同时还是必须要设置class的类名，否则typeorm无法正确解析设置数据库表名
+- 如果有多个连接，则每个连接必须提供name属性，且唯一。name也是entity下的子目录区分。这是entity目录下直接实体将挂在第一个数据库配置连接上。比如连接2使用db2，则entity目录下db2目录下的entity才会绑定给这个连接。
+- 如果单个连接，则所有实体entity都会挂在这个连接上，不会按二级目录区分。
+
+
+
+
+## Questions & Suggestions
+
+Please open an issue [here](https://github.com/eggjs/egg/issues).
+
+## License
+
+[MIT](LICENSE)

package/README.zh_CN.md

@@ -1,4 +1,4 @@
-# egg-ts-template
+# egg-typeorm
 
 [![NPM version][npm-image]][npm-url]
 [![build status][travis-image]][travis-url]
@@ -28,7 +28,7 @@ Description here.
 
 ### 依赖的 egg 版本
 
-egg-ts-template 版本 | egg 1.x
+@diyaner/egg-typeorm 版本 | egg 3.x
 --- | ---
 1.x | 😁
 0.x | ❌
@@ -47,9 +47,9 @@ egg-ts-template 版本 | egg 1.x
 
 ```js
 // config/plugin.js
-exports.tsTemplate = {
+exports.typeorm = {
   enable: true,
-  package: 'egg-ts-template',
+  package: '@diyaner/egg-typeorm',
 };
 ```
 

package/agent.js

@@ -1,21 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
+const typeorm = require("typeorm");
 const loader_1 = require("./lib/loader");
 const connection_1 = require("./lib/connection");
 class EggTypeOrmAppBoot {
     constructor(app) {
         this.app = app;
+        if (this.app.config.typeorm.agent) {
+            this.app.typeorm = {};
+            this.app.typeorm.typeORM = typeorm;
+            this.app.typeorm.datasources = {};
+            this.app.typeorm.entites = { all: [], level1: [], dirs: {} };
+            this.app.typeorm.createTypeORMDataSources = connection_1.createTypeORMDataSources;
+        }
     }
-    configDidLoad() {
+    configDidLoad() { }
+    async didLoad() { }
+    async willReady() {
         if (this.app.config.typeorm.agent) {
-            this.app.typeorm = this.app.typeorm || {
-                dataSource: {},
-            };
             (0, loader_1.default)(this.app);
-            (0, connection_1.default)(this.app);
+            await (0, connection_1.default)(this.app);
+        }
+    }
+    async beforeClose() {
+        if (this.app.config.typeorm.agent) {
+            for (const ds of Object.keys(this.app.typeorm.datasources)) {
+                await this.app.typeorm.datasources[ds].destroy();
+            }
         }
     }
 }
 exports.default = EggTypeOrmAppBoot;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUUxQix5Q0FBc0M7QUFDdEMsaURBQTJDO0FBRTNDLE1BQXFCLGlCQUFpQjtJQUVyQyxZQUFZLEdBQWdCO1FBQzNCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0lBQ2hCLENBQUM7SUFDRCxhQUFhO1FBQ1osSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQ2xDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxJQUFJO2dCQUN0QyxVQUFVLEVBQUUsRUFBRTthQUNkLENBQUM7WUFDRixJQUFBLGdCQUFVLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3JCLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7U0FJdEI7SUFDRixDQUFDO0NBQ0Q7QUFqQkQsb0NBaUJDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUMxQixtQ0FBbUM7QUFFbkMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFVO1FBQ3JCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBRWYsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQ2xDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztZQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztTQUNyRTtJQUNGLENBQUM7SUFDRCxhQUFhLEtBQVUsQ0FBQztJQUV4QixLQUFLLENBQUMsT0FBTyxLQUFJLENBQUM7SUFFbEIsS0FBSyxDQUFDLFNBQVM7UUFDZCxJQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUU7WUFDbEMsSUFBQSxnQkFBVSxFQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNyQixNQUFNLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDNUI7SUFDRixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFO1lBQ2xDLEtBQUssTUFBTSxFQUFFLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRTtnQkFDM0QsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7YUFDakQ7U0FDRDtJQUNGLENBQUM7Q0FDRDtBQS9CRCxvQ0ErQkMifQ==

package/app.js

@@ -7,13 +7,23 @@ const connection_1 = require("./lib/connection");
 class EggTypeOrmAppBoot {
     constructor(app) {
         this.app = app;
+        this.app.typeorm = {};
+        this.app.typeorm.typeORM = typeorm;
+        this.app.typeorm.datasources = {};
+        this.app.typeorm.entites = { all: [], level1: [], dirs: {} };
+        this.app.typeorm.createTypeORMDataSources = connection_1.createTypeORMDataSources;
     }
-    configDidLoad() {
-        this.app.typeorm = this.app.typeorm || typeorm;
-        this.app.typeorm.dataSources = {};
+    configDidLoad() { }
+    async didLoad() { }
+    async willReady() {
         (0, loader_1.default)(this.app);
-        (0, connection_1.default)(this.app);
+        await (0, connection_1.default)(this.app);
+    }
+    async beforeClose() {
+        for (const ds of Object.keys(this.app.typeorm.datasources)) {
+            await this.app.typeorm.datasources[ds].destroy();
+        }
     }
 }
 exports.default = EggTypeOrmAppBoot;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLG1DQUFtQztBQUduQyx5Q0FBc0M7QUFDdEMsaURBQTJDO0FBRTNDLE1BQXFCLGlCQUFpQjtJQUVyQyxZQUFZLEdBQWdCO1FBQzNCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0lBQ2hCLENBQUM7SUFDRCxhQUFhO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLElBQUksT0FBTyxDQUFDO1FBQy9DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7UUFFbEMsSUFBQSxnQkFBVSxFQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBR3ZCLENBQUM7Q0FDRDtBQWRELG9DQWNDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLG1DQUFtQztBQUduQyx5Q0FBc0M7QUFDdEMsaURBQXlFO0FBRXpFLE1BQXFCLGlCQUFpQjtJQUVyQyxZQUFZLEdBQWdCO1FBQzNCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBRWYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEdBQUcsRUFBUyxDQUFDO1FBQzdCLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDbkMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxHQUFHLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQzdELElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLHdCQUF3QixHQUFHLHFDQUF3QixDQUFDO0lBQ3RFLENBQUM7SUFDRCxhQUFhLEtBQVUsQ0FBQztJQUV4QixLQUFLLENBQUMsT0FBTyxLQUFJLENBQUM7SUFHbEIsS0FBSyxDQUFDLFNBQVM7UUFDZCxJQUFBLGdCQUFVLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3JCLE1BQU0sSUFBQSxvQkFBVyxFQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQzNELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1NBQ2pEO0lBQ0YsQ0FBQztDQUNEO0FBMUJELG9DQTBCQyJ9

package/config/config.default.js

@@ -7,4 +7,4 @@ exports.default = () => {
     };
     return config;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb25maWcuZGVmYXVsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxZQUFZLENBQUM7O0FBVWIsa0JBQWUsR0FBRyxFQUFFO0lBQ25CLE1BQU0sTUFBTSxHQUFHLEVBQWdDLENBQUM7SUFDaEQsTUFBTSxDQUFDLE9BQU8sR0FBRztRQUNoQixLQUFLLEVBQUMsS0FBSztLQUNYLENBQUM7SUFDRixPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb25maWcuZGVmYXVsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxZQUFZLENBQUM7O0FBVWIsa0JBQWUsR0FBRyxFQUFFO0lBQ25CLE1BQU0sTUFBTSxHQUFHLEVBQWdDLENBQUM7SUFDaEQsTUFBTSxDQUFDLE9BQU8sR0FBRztRQUNoQixLQUFLLEVBQUUsS0FBSztLQUNaLENBQUM7SUFDRixPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUMsQ0FBQyJ9

package/index.d.ts

@@ -1,37 +1,79 @@
-/*
- * @copyright: Huang Ding
- * @Author: ding-cx
- * @Date: 2021-02-21 17:47:08
- * @LastEditors: ding-cx
- * @LastEditTime: 2021-02-21 17:47:51
- * @Description: file content
- */
-
-import Egg from "egg";
-import * as typeorm from "typeorm";
-
-declare module "egg" {
-	/** egg插件的typeorm的连接选项 */
-
-	/** typeorm 已弃用name属性，但egg-typeorm需要使用 */
-	type EggConfigTypeormDataSourceOptions = { name?: string } & typeorm.DataSourceOptions;
-	interface EggAppConfig {
-		/** typeorm 数据库连接配置 */
-		typeorm: {
-			/** 是否在agent上启用typeorm */
-			agent: boolean;
-			datasources: EggConfigTypeormDataSourceOptions[];
-		};
-	}
-
-	interface Application {
-		/** 绑定所有typeorm的导出，并添加连接实例map */
-		typeorm: typeof typeorm & {
-			/** 数据库连接实例 其key为配置时的name属性 */
-			dataSources: {
-				[key: string]: typeorm.DataSource;
-			};
-		};
-	}
-}
-export = Egg;
+/*
+ * @copyright: Huang Ding
+ * @Author: ding-cx
+ * @Date: 2021-02-21 17:47:08
+ * @LastEditors: ding-cx
+ * @LastEditTime: 2021-02-21 17:47:51
+ * @Description: file content
+ */
+
+import Egg from "egg";
+import * as typeorm from "typeorm";
+import { createTypeORMDataSources } from "./lib/connection";
+import { MyDataSource } from "./lib/MyDataSource";
+
+declare module "egg" {
+	/** egg插件的typeorm的连接选项 */
+
+	/** typeorm 已弃用name属性，暂时加上 */
+	type EggConfigTypeormDataSourceOptions = {
+		name?: string;
+		/** 实体类所在目录名 */
+		entityDir?: string;
+	} & typeorm.DataSourceOptions;
+	interface EggAppConfig {
+		/** typeorm 数据库连接配置 */
+		typeorm: {
+			/** 是否在agent上启用typeorm */
+			agent: boolean;
+			datasources: EggConfigTypeormDataSourceOptions[];
+		};
+	}
+
+	interface Application {
+		/** 绑定所有typeorm的导出，并添加连接实例map */
+		typeorm: {
+			typeORM: typeof typeorm;
+			/** 数据库连接实例 其key为配置时的name属性 */
+			datasources: {
+				[key: string]: MyDataSource;
+			};
+			/** 绑定实体类列表 */
+			entites: {
+				all: any[];
+				// 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
+				level1: any[];
+				// 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
+				dirs: {
+					[key: string]: any[];
+				};
+			};
+			/** 挂载app上，可动态创建typeORM实例 */
+			createTypeORMDataSources: createTypeORMDataSources;
+		};
+	}
+
+	interface Agent {
+		/** 绑定所有typeorm的导出，并添加连接实例map */
+		typeorm: {
+			typeORM: typeof typeorm;
+			/** 数据库连接实例 其key为配置时的name属性 */
+			datasources: {
+				[key: string]: MyDataSource;
+			};
+			/** 绑定实体类列表 */
+			entites: {
+				all: any[];
+				// 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
+				level1: any[];
+				// 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
+				dirs: {
+					[key: string]: any[];
+				};
+			};
+			/** 挂载app上，可动态创建typeORM实例 */
+			createTypeORMDataSources: createTypeORMDataSources;
+		};
+	}
+}
+export = Egg;

package/lib/Logger.d.ts

@@ -1,8 +1,8 @@
-import { Application } from "egg";
+import { Agent, Application } from "egg";
 import { Logger, QueryRunner } from "typeorm";
 export default class EggTypeORMLogger implements Logger {
     private app;
-    constructor(app: Application);
+    constructor(app: Application | Agent);
     logQuery(query: string, parameters?: any[] | undefined, _queryRunner?: QueryRunner | undefined): void;
     logQueryError(error: string | Error, query: string, parameters?: any[] | undefined, _queryRunner?: QueryRunner | undefined): void;
     logQuerySlow(time: number, query: string, parameters?: any[] | undefined, _queryRunner?: QueryRunner | undefined): void;

package/lib/Logger.js

@@ -27,4 +27,4 @@ class EggTypeORMLogger {
     }
 }
 exports.default = EggTypeORMLogger;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQWdCO1FBQWhCLFFBQUcsR0FBSCxHQUFHLENBQWE7UUFvQnBDLGNBQVMsR0FBRztZQUNYLEdBQUcsRUFBRSxNQUFNO1lBQ1gsSUFBSSxFQUFFLE1BQU07WUFDWixJQUFJLEVBQUUsTUFBTTtTQUNaLENBQUM7SUF4QnFDLENBQUM7SUFDeEMsUUFBUSxDQUFDLEtBQWEsRUFBRSxVQUE4QixFQUFFLFlBQXNDO1FBQzdGLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxnQ0FBZ0MsRUFBRSxLQUFLLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUNELGFBQWEsQ0FBQyxLQUFxQixFQUFFLEtBQWEsRUFBRSxVQUE4QixFQUFFLFlBQXNDO1FBQ3pILElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFDRCxZQUFZLENBQUMsSUFBWSxFQUFFLEtBQWEsRUFBRSxVQUE4QixFQUFFLFlBQXNDO1FBQy9HLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxnREFBZ0QsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ3JHLENBQUM7SUFHRCxjQUFjLENBQUMsT0FBZSxFQUFFLFdBQXFDO0lBRXJFLENBQUM7SUFFRCxZQUFZLENBQUMsT0FBZSxFQUFFLFdBQXFDO0lBRW5FLENBQUM7SUFTRCxHQUFHLENBQUMsS0FBOEIsRUFBRSxPQUFZLEVBQUUsV0FBcUM7UUFFdEYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2pELENBQUM7Q0FDRDtBQWhDRCxtQ0FnQ0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQXdCO1FBQXhCLFFBQUcsR0FBSCxHQUFHLENBQXFCO1FBb0I1QyxjQUFTLEdBQUc7WUFDWCxHQUFHLEVBQUUsTUFBTTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osSUFBSSxFQUFFLE1BQU07U0FDWixDQUFDO0lBeEI2QyxDQUFDO0lBQ2hELFFBQVEsQ0FBQyxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUM3RixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0NBQWdDLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2hGLENBQUM7SUFDRCxhQUFhLENBQUMsS0FBcUIsRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUN6SCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBQ0QsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUMvRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0RBQWdELEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNyRyxDQUFDO0lBR0QsY0FBYyxDQUFDLE9BQWUsRUFBRSxXQUFxQztJQUVyRSxDQUFDO0lBRUQsWUFBWSxDQUFDLE9BQWUsRUFBRSxXQUFxQztJQUVuRSxDQUFDO0lBU0QsR0FBRyxDQUFDLEtBQThCLEVBQUUsT0FBWSxFQUFFLFdBQXFDO1FBRXRGLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNqRCxDQUFDO0NBQ0Q7QUFoQ0QsbUNBZ0NDIn0=

package/lib/MyDataSource.d.ts

@@ -0,0 +1,8 @@
+import { DataSource, QueryRunner } from "typeorm";
+export declare class MyDataSource extends DataSource {
+    private customAddEntityCacheMap;
+    addEntity<T extends Function>(clz: T): Promise<this>;
+    private buildMetaData2;
+    removeEntity<T extends Function>(clz: T): void;
+    query2<T = any>(query: string, parameters: Record<string, any>, queryRunner?: QueryRunner): Promise<T>;
+}

package/lib/MyDataSource.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MyDataSource = void 0;
+const typeorm_1 = require("typeorm");
+const ConnectionMetadataBuilder_1 = require("typeorm/connection/ConnectionMetadataBuilder");
+const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetadataValidator");
+class MyDataSource extends typeorm_1.DataSource {
+    constructor() {
+        super(...arguments);
+        this.customAddEntityCacheMap = new Map();
+    }
+    async addEntity(clz) {
+        const entityCacheClz = this.customAddEntityCacheMap.get(clz);
+        if (entityCacheClz) {
+            return this;
+        }
+        await this.buildMetaData2(clz);
+        this.customAddEntityCacheMap.set(clz, true);
+        return this;
+    }
+    async buildMetaData2(entity) {
+        const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
+        const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
+        const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas([entity]);
+        for (const metadata of entityMetadatas) {
+            this.entityMetadatas.push(metadata);
+            this.entityMetadatasMap.set(metadata.target, metadata);
+        }
+        entityMetadataValidator.validateMany(entityMetadatas, this.driver);
+        for (let entityMetadata of entityMetadatas) {
+            if (typeorm_1.InstanceChecker.isBaseEntityConstructor(entityMetadata.target)) {
+                entityMetadata.target.useDataSource(this);
+            }
+        }
+    }
+    removeEntity(clz) {
+        this.customAddEntityCacheMap.delete(clz);
+        const metadata = this.entityMetadatasMap.get(clz);
+        if (metadata && typeorm_1.InstanceChecker.isBaseEntityConstructor(metadata.target)) {
+            metadata.target.dataSource = null;
+        }
+        this.entityMetadatas = this.entityMetadatas.filter((item) => item.target !== clz);
+        this.entityMetadatasMap.delete(clz);
+    }
+    async query2(query, parameters, queryRunner) {
+        const result = this.driver.escapeQueryWithParameters(query, parameters, {});
+        return await super.query(result[0], result[1], queryRunner);
+    }
+}
+exports.MyDataSource = MyDataSource;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlEYXRhU291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTXlEYXRhU291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUFtRTtBQUNuRSw0RkFBeUY7QUFDekYsOEZBQTJGO0FBTTNGLE1BQWEsWUFBYSxTQUFRLG9CQUFVO0lBQTVDOztRQUNTLDRCQUF1QixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO0lBNkQ3RCxDQUFDO0lBcERBLEtBQUssQ0FBQyxTQUFTLENBQXFCLEdBQU07UUFDekMsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRTtZQUNuQixPQUFPLElBQUksQ0FBQztTQUNaO1FBRUQsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVDLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUdPLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBZ0I7UUFDNUMsTUFBTSx5QkFBeUIsR0FBRyxJQUFJLHFEQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRzlELE1BQU0sZUFBZSxHQUFHLE1BQU0seUJBQXlCLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3ZGLEtBQUssTUFBTSxRQUFRLElBQUksZUFBZSxFQUFFO1lBQ3ZDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztTQUN2RDtRQUdELHVCQUF1QixDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBR25FLEtBQUssSUFBSSxjQUFjLElBQUksZUFBZSxFQUFFO1lBQzNDLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUU7Z0JBQ25FLGNBQWMsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQzFDO1NBQ0Q7SUFDRixDQUFDO0lBR0QsWUFBWSxDQUFxQixHQUFNO1FBQ3RDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNsRCxJQUFJLFFBQVEsSUFBSSx5QkFBZSxDQUFDLHVCQUF1QixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUV6RSxRQUFRLENBQUMsTUFBTSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUM7U0FDbEM7UUFFRCxJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQyxDQUFDO1FBQ2xGLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUdELEtBQUssQ0FBQyxNQUFNLENBQVUsS0FBYSxFQUFFLFVBQStCLEVBQUUsV0FBeUI7UUFDOUYsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLLEVBQUUsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQzVFLE9BQU8sTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDN0QsQ0FBQztDQUNEO0FBOURELG9DQThEQyJ9

package/lib/connection.d.ts

@@ -1,2 +1,7 @@
-import { Application } from "egg";
-export default function (app: Application): Promise<void>;
+import { Application, Agent, EggConfigTypeormDataSourceOptions } from "egg";
+import { MyDataSource } from "./MyDataSource";
+export default function (app: Application | Agent): Promise<void>;
+export declare function createTypeORMDataSources(app: Application | Agent, datasourcesConfig: EggConfigTypeormDataSourceOptions, entities?: any[]): Promise<{
+    config: EggConfigTypeormDataSourceOptions;
+    dataSource: MyDataSource;
+}>;

package/lib/connection.js

@@ -1,22 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
+exports.createTypeORMDataSources = void 0;
 const Logger_1 = require("./Logger");
+const assert = require("assert");
+const MyDataSource_1 = require("./MyDataSource");
 async function default_1(app) {
-    await connect(app);
-}
-exports.default = default_1;
-async function connect(app) {
-    const entities = app.config["__typeormAllEntityList"];
-    app.config["__typeormAllEntityList"] = undefined;
+    const entities = app.typeorm.entites;
     const config = app.config.typeorm.datasources;
-    if (config.length <= 0)
-        throw new Error(`typeorm plugin need your provide database connection params.`);
+    assert.ok(config.length > 0, `typeorm plugin need you provide database connection params.`);
     if (config.length > 1) {
         config.forEach((item, index) => {
-            if (!item.name)
-                throw new Error(`多个数据库配置，每个连接配置必须指定name属性！`);
-            item.entities = [...(entities.dirs[item.name] || [])];
+            let entityDirName = item.entityDir || item.name;
+            assert.ok(entityDirName, `Error, connection need a unique entityDir or name for relate entity dir. ${item.host}`);
+            entityDirName = entityDirName.replace(/[._-]/gi, "").toUpperCase();
+            item.entities = [...(entities.dirs[entityDirName] || [])];
             if (index === 0) {
                 item.entities = [...(entities.level1 || []), ...item.entities];
             }
@@ -26,25 +23,46 @@ async function connect(app) {
         config[0].entities = [...(entities.all || [])];
     }
     const names = [];
-    config.forEach((item) => {
-        if (item.logger === undefined) {
-            item.logger = new Logger_1.default(app);
-        }
+    for (const item of config) {
         item.name = item.name || "default";
         if (names.includes(item.name)) {
-            throw new Error(`Egg-TypeORM: Error every connection config must private unique name property. your name [${item.name}] has duplicated.`);
+            throw new Error(`Egg-TypeORM: Error, your datasources name [${item.name}] has duplicated.`);
         }
         names.push(item.name);
-        const ds = new typeorm_1.DataSource(item);
-        ds.initialize()
-            .then(() => {
-            app.coreLogger.info(`TypeORM DataSource %s %s %s init successed.`, item.host, item.port, item.name);
-        })
-            .catch((err) => {
-            app.coreLogger.info(`TypeORM DataSource %s %s %s init failed. reason: \r\n %s`, item.host, item.prt, item.name, err);
-            process.exit(1);
-        });
-        app.typeorm.dataSources[item.name] = ds;
-    });
+        try {
+            const res = await createTypeORMDataSources(app, item);
+            app.typeorm.datasources[item.name] = res.dataSource;
+            app.coreLogger.info(`[Egg-TypeORM] DataSource %s %s, [%s] init success.`, item.host, item.port, item.name);
+        }
+        catch (err) {
+            app.coreLogger.error(`[Egg-TypeORM] DataSource %s %s, [%s] init failed. reason: \r\n %s`, item.host, item.port, item.name, err);
+            setTimeout(() => {
+                process.exit(1);
+            }, 600);
+        }
+    }
+}
+exports.default = default_1;
+async function createTypeORMDataSources(app, datasourcesConfig, entities) {
+    if (datasourcesConfig.logger === undefined) {
+        datasourcesConfig.logger = new Logger_1.default(app);
+    }
+    if (entities) {
+        datasourcesConfig.entities = entities;
+    }
+    const ds = new MyDataSource_1.MyDataSource(datasourcesConfig);
+    for (let i = 0; i < 3; i++) {
+        try {
+            await ds.initialize();
+            return { config: datasourcesConfig, dataSource: ds };
+        }
+        catch (error) {
+            app.coreLogger.error(`[Egg-TypeORM] DataSource %s %s, [%s] init failed. reason: \r\n %s`, datasourcesConfig.host, datasourcesConfig.port, datasourcesConfig.name, error.message);
+            app.coreLogger.info(`[Egg-TypeORM] DataSource %s %s, [%s] retry init connection...`, datasourcesConfig.host, datasourcesConfig.port, datasourcesConfig.name);
+            await new Promise((resolve) => setTimeout(resolve, 1200));
+        }
+    }
+    throw new Error(`the DB init connection was failed after retry 3 times.`);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxxQ0FBd0Q7QUFDeEQscUNBQXdDO0FBS3pCLEtBQUssb0JBQVcsR0FBZ0I7SUFFOUMsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDcEIsQ0FBQztBQUhELDRCQUdDO0FBRUQsS0FBSyxVQUFVLE9BQU8sQ0FBQyxHQUFnQjtJQUN0QyxNQUFNLFFBQVEsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDdEQsR0FBRyxDQUFDLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxHQUFHLFNBQVMsQ0FBQztJQUVqRCxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDOUMsSUFBSSxNQUFNLENBQUMsTUFBTSxJQUFJLENBQUM7UUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLDhEQUE4RCxDQUFDLENBQUM7SUFDeEcsSUFBSSxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtRQUV0QixNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFO1lBQzlCLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSTtnQkFBRSxNQUFNLElBQUksS0FBSyxDQUFDLDJCQUEyQixDQUFDLENBQUM7WUFHN0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBRXRELElBQUksS0FBSyxLQUFLLENBQUMsRUFBRTtnQkFFaEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO2FBQy9EO1FBQ0YsQ0FBQyxDQUFDLENBQUM7S0FDSDtTQUFNO1FBRU4sTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7S0FDL0M7SUFFRCxNQUFNLEtBQUssR0FBYSxFQUFFLENBQUM7SUFDM0IsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBRXZCLElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxTQUFTLEVBQUU7WUFFOUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3hDO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLFNBQVMsQ0FBQztRQUNuQyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzlCLE1BQU0sSUFBSSxLQUFLLENBQUMsNEZBQTRGLElBQUksQ0FBQyxJQUFJLG1CQUFtQixDQUFDLENBQUM7U0FDMUk7UUFDRCxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0QixNQUFNLEVBQUUsR0FBRyxJQUFJLG9CQUFVLENBQUMsSUFBeUIsQ0FBQyxDQUFDO1FBQ3JELEVBQUUsQ0FBQyxVQUFVLEVBQUU7YUFDYixJQUFJLENBQUMsR0FBRyxFQUFFO1lBQ1YsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsNkNBQTZDLEVBQUcsSUFBWSxDQUFDLElBQUksRUFBRyxJQUFZLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2SCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUNkLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLDBEQUEwRCxFQUFHLElBQVksQ0FBQyxJQUFJLEVBQUcsSUFBWSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQ3ZJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDakIsQ0FBQyxDQUFDLENBQUM7UUFFSixHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3pDLENBQUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9
+exports.createTypeORMDataSources = createTypeORMDataSources;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EscUNBQXdDO0FBQ3hDLGlDQUFpQztBQUNqQyxpREFBOEM7QUFLL0IsS0FBSyxvQkFBVyxHQUF3QjtJQUN0RCxNQUFNLFFBQVEsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUNyQyxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFFOUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSw2REFBNkQsQ0FBQyxDQUFDO0lBRTVGLElBQUksTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7UUFFdEIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRTtZQUM5QixJQUFJLGFBQWEsR0FBRyxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUM7WUFDaEQsTUFBTSxDQUFDLEVBQUUsQ0FBQyxhQUFhLEVBQUUsNEVBQTZFLElBQVksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBRTNILGFBQWEsR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUVuRSxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztZQUUxRCxJQUFJLEtBQUssS0FBSyxDQUFDLEVBQUU7Z0JBRWhCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQzthQUMvRDtR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

package/lib/loader.d.ts

@@ -1,3 +1,3 @@
-import { Application } from "egg";
-declare const _default: (app: Application) => Promise<void>;
+import { Application, Agent } from "egg";
+declare const _default: (app: Application | Agent) => Promise<void>;
 export default _default;

package/lib/loader.js

@@ -3,20 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 exports.default = async (app) => {
     const dir = path.join(app.config.baseDir, "app/entity");
-    const entitys = (app.config["__typeormAllEntityList"] = {
+    app.typeorm.entites = app.typeorm.entites || {
         dirs: {},
-        level1: [],
         all: [],
-    });
+        level1: [],
+    };
+    const entitys = app.typeorm.entites;
     app.loader.loadToApp(dir, "entity", {
+        caseStyle: "upper",
         initializer(Clz, opt) {
+            Clz.app = app;
             const properties = opt.pathName.split(".");
             entitys.all.push(Clz);
             if (properties.length === 2) {
                 entitys.level1.push(Clz);
             }
             else if (properties.length > 2) {
-                const dirName = properties[1];
+                const dirName = properties[1].toUpperCase();
                 entitys.dirs[dirName] = entitys.dirs[dirName] || [];
                 entitys.dirs[dirName].push(Clz);
             }
@@ -24,4 +27,4 @@ exports.default = async (app) => {
         },
     });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNkJBQTZCO0FBRTdCLGtCQUFlLEtBQUssRUFBRSxHQUFnQixFQUFFLEVBQUU7SUFDekMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN4RCxNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsd0JBQXdCLENBQUMsR0FBRztRQUV2RCxJQUFJLEVBQUUsRUFBRTtRQUVSLE1BQU0sRUFBRSxFQUFFO1FBQ1YsR0FBRyxFQUFFLEVBQUU7S0FDQSxDQUFDLENBQUM7SUFFVixHQUFHLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFO1FBRW5DLFdBQVcsQ0FBQyxHQUFHLEVBQUUsR0FBRztZQUluQixNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUUzQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUV0QixJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO2dCQUM1QixPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUN6QjtpQkFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO2dCQUVqQyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3BELE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2FBQ2hDO1lBRUQsT0FBTyxHQUFHLENBQUM7UUFDWixDQUFDO0tBQ0QsQ0FBQyxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNkJBQTZCO0FBRTdCLGtCQUFlLEtBQUssRUFBRSxHQUF3QixFQUFFLEVBQUU7SUFDakQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN4RCxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSTtRQUM1QyxJQUFJLEVBQUUsRUFBRTtRQUNSLEdBQUcsRUFBRSxFQUFFO1FBQ1AsTUFBTSxFQUFFLEVBQUU7S0FDVixDQUFDO0lBQ0YsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFFcEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtRQUNuQyxTQUFTLEVBQUUsT0FBTztRQUVsQixXQUFXLENBQUMsR0FBRyxFQUFFLEdBQUc7WUFFbkIsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7WUFJZCxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUczQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUV0QixJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO2dCQUM1QixPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUN6QjtpQkFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO2dCQUdqQyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7Z0JBQzVDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3BELE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2FBQ2hDO1lBRUQsT0FBTyxHQUFHLENBQUM7UUFDWixDQUFDO0tBQ0QsQ0FBQyxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/package.json

@@ -1,64 +1,64 @@
-{
-  "name": "@diyaner/egg-typeorm",
-  "version": "1.0.1",
-  "description": "egg plugin for nodejs orm freamwork typeorm.",
-  "eggPlugin": {
-    "name": "typeorm"
-  },
-  "keywords": [
-    "egg",
-    "eggPlugin",
-    "egg-plugin",
-    "egg-typeorm",
-    "typeorm"
-  ],
-  "dependencies": {
-    "reflect-metadata": "^0.1.13",
-    "typeorm": "^0.3.17"
-  },
-  "devDependencies": {
-    "@types/mocha": "^8.2.1",
-    "autod": "^3.0.1",
-    "autod-egg": "^1.1.0",
-    "egg": "^3.17.4",
-    "egg-bin": "^6.4.2",
-    "egg-ci": "^1.11.0",
-    "egg-mock": "^3.21.0",
-    "eslint": "^5.13.0",
-    "eslint-config-egg": "^7.1.0",
-    "mysql2": "^3.6.0",
-    "typescript": "^5.1.3"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "scripts": {
-    "test": "npm run lint -- --fix && egg-bin pkgfiles && npm run test-local",
-    "test-local": "egg-bin test && npm run clean:js",
-    "tsc": "tsc",
-    "clean:js": "tsc -b --clean",
-    "release": "tsc && npm publish --access public && npm run clean:js",
-    "cov": "egg-bin cov",
-    "lint": "eslint .",
-    "ci": "egg-bin pkgfiles --check && npm run lint && npm run cov",
-    "pkgfiles": "egg-bin pkgfiles",
-    "autod": "autod"
-  },
-  "files": [
-    "app.js",
-    "agent.js",
-    "tshelper.js",
-    "config/**/*.js",
-    "app/**/*.js",
-    "lib/**/*.js",
-    "lib/**/*.d.ts",
-    "typeorm.js",
-    "typeorm.d.ts",
-    "index.d.ts"
-  ],
-  "ci": {
-    "version": "8, 10"
-  },
-  "author": "ding",
-  "license": "MIT"
-}
+{
+  "name": "@diyaner/egg-typeorm",
+  "version": "2.0.1",
+  "description": "egg plugin for nodejs orm freamwork typeorm.",
+  "eggPlugin": {
+    "name": "typeorm"
+  },
+  "keywords": [
+    "egg",
+    "eggPlugin",
+    "egg-plugin",
+    "egg-typeorm",
+    "typeorm"
+  ],
+  "dependencies": {
+    "reflect-metadata": "^0.1.13",
+    "typeorm": "^0.3.20"
+  },
+  "devDependencies": {
+    "@types/mocha": "^8.2.1",
+    "autod": "^3.0.1",
+    "autod-egg": "^1.1.0",
+    "egg": "^3.17.4",
+    "egg-bin": "^6.4.2",
+    "egg-ci": "^1.11.0",
+    "egg-mock": "^3.21.0",
+    "eslint": "^5.13.0",
+    "eslint-config-egg": "^7.1.0",
+    "mysql2": "^3.6.0",
+    "typescript": "^5.1.3"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "scripts": {
+    "test": "npm run lint -- --fix && npm run test-local",
+    "test-local": "egg-bin test && npm run clean:js",
+    "tsc": "tsc",
+    "clean:js": "tsc -b --clean",
+    "release": "tsc && npm publish --access public && npm run clean:js",
+    "cov": "egg-bin cov",
+    "lint": "eslint .",
+    "ci": "egg-bin pkgfiles --check && npm run lint && npm run cov",
+    "pkgfiles": "egg-bin pkgfiles",
+    "autod": "autod"
+  },
+  "files": [
+    "app.js",
+    "agent.js",
+    "tshelper.js",
+    "config/**/*.js",
+    "app/**/*.js",
+    "lib/**/*.js",
+    "lib/**/*.d.ts",
+    "typeorm.js",
+    "typeorm.d.ts",
+    "index.d.ts"
+  ],
+  "ci": {
+    "version": "8, 10"
+  },
+  "author": "ding",
+  "license": "MIT"
+}

package/tshelper.js

@@ -1,24 +1,50 @@
-module.exports = {
-	watchDirs: {
-		entity: {
-			directory: "app/entity",
-			generator: "object",
-			interface: "IEntity",
-			declareTo: "Application.entity",
-			// caseStyle: "upper",
-			watch: true,
-			distName: "entity.d.ts",
-		},
-	},
-	generatorConfig: {
-		entity: {
-			directory: "app/entity",
-			generator: "object",
-			interface: "IEntity",
-			declareTo: "Application.entity",
-			// caseStyle: "upper",
-			watch: true,
-			distName: "entity.d.ts",
-		},
-	},
-};
+'use strict';
+// const ClassGenerator = require("egg-ts-helper/dist/generators/class").default;
+module.exports = {
+  watchDirs: {
+    entity: {
+      directory: 'app/entity',
+      generator: 'object',
+      interface: 'IEntity',
+      declareTo: 'Application.entity',
+      caseStyle: "upper",
+      watch: true,
+      distName: 'entity.d.ts',
+    },
+  },
+  generatorConfig: {
+    entity: {
+      directory: 'app/entity',
+      generator: 'object',
+      interface: 'IEntity',
+      declareTo: 'Application.entity',
+      caseStyle: "upper",
+      watch: true,
+      distName: 'entity.d.ts',
+    },
+  },
+};
+
+
+
+/** 
+ * 插件提供的接口方式为、1直接提供类，2提供一个函数，函数返回类
+ * - 使用这种自定义方式进行类型提取
+ */
+function TypeOrmEntityGenerator(config, baseConfig) {
+  config.interfaceHandle = config.interfaceHandle || 'AutoTypeOfObject<typeof {{ 0 }}>';
+
+  const result = ClassGenerator(config, baseConfig);
+  /* istanbul ignore else */
+  if (result.content) {
+    result.content = [
+      'type AnyClass = new (...args: any[]) => any;',
+      'type AnyFunc<T = any> = (...args: any[]) => T;',
+      'type CanExportFunc = AnyFunc<Promise<any>> | AnyFunc<IterableIterator<any>>;',
+      'type AutoTypeOfObject<T> = T extends AnyClass ? T : T extends AnyFunc ? ReturnType<T> : T;',
+      result.content,
+    ].join('\n');
+  }
+
+  return result;
+}