@diyaner/egg-typeorm 2.3.1 → 2.5.0

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.
Files changed (12) hide show
  1. package/LICENSE +21 -21
  2. package/README.md +75 -75
  3. package/README.zh_CN.md +76 -76
  4. package/index.d.ts +87 -83
  5. package/lib/EggDataSource.d.ts +24 -9
  6. package/lib/EggDataSource.js +131 -32
  7. package/lib/Logger.js +3 -3
  8. package/lib/connection.js +6 -5
  9. package/package.json +64 -64
  10. package/tshelper.js +50 -50
  11. package/typeorm.d.ts +2 -0
  12. package/typeorm.js +4 -2
package/LICENSE CHANGED
@@ -1,21 +1,21 @@
1
- The MIT License (MIT)
2
-
3
- Copyright (c) 2019-present Alibaba Group Holding Limited and other contributors.
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in all
13
- copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
- SOFTWARE.
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2019-present Alibaba Group Holding Limited and other contributors.
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in all
13
+ copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
+ SOFTWARE.
package/README.md CHANGED
@@ -1,75 +1,75 @@
1
- # egg-ts-template
2
-
3
- [![NPM version][npm-image]][npm-url]
4
- [![build status][travis-image]][travis-url]
5
- [![Test coverage][codecov-image]][codecov-url]
6
- [![David deps][david-image]][david-url]
7
- [![Known Vulnerabilities][snyk-image]][snyk-url]
8
- [![npm download][download-image]][download-url]
9
-
10
- [npm-image]: https://img.shields.io/npm/v/egg-ts-template.svg?style=flat-square
11
- [npm-url]: https://npmjs.org/package/egg-ts-template
12
- [travis-image]: https://img.shields.io/travis/eggjs/egg-ts-template.svg?style=flat-square
13
- [travis-url]: https://travis-ci.org/eggjs/egg-ts-template
14
- [codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-ts-template.svg?style=flat-square
15
- [codecov-url]: https://codecov.io/github/eggjs/egg-ts-template?branch=master
16
- [david-image]: https://img.shields.io/david/eggjs/egg-ts-template.svg?style=flat-square
17
- [david-url]: https://david-dm.org/eggjs/egg-ts-template
18
- [snyk-image]: https://snyk.io/test/npm/egg-ts-template/badge.svg?style=flat-square
19
- [snyk-url]: https://snyk.io/test/npm/egg-ts-template
20
- [download-image]: https://img.shields.io/npm/dm/egg-ts-template.svg?style=flat-square
21
- [download-url]: https://npmjs.org/package/egg-ts-template
22
-
23
- <!--
24
- Description here.
25
- -->
26
-
27
- ## Install
28
-
29
- ```bash
30
- $ npm i @diyaner/egg-typeorm --save
31
- ```
32
-
33
- ## Usage
34
-
35
- ```js
36
- // {app_root}/config/plugin.js
37
- exports.typeorm = {
38
- enable: true,
39
- package: '@diyaner/egg-typeorm',
40
- };
41
- ```
42
-
43
- ## Configuration
44
-
45
- ```js
46
- // {app_root}/config/config.default.js
47
- exports.typeorm = {
48
- agent:true,
49
- datasources:[
50
- {...}
51
- ]
52
- };
53
- ```
54
-
55
- see [config/config.default.js](config/config.default.js) for more detail.
56
-
57
- ## Example
58
-
59
- <!-- example here -->
60
- - 实体entity放在app/entity目录下
61
- - 实体必须使用默认default导出，这样才能正确使用ets自动类型声明并绑定给app.entity
62
- - 实体default导出，同时还是必须要设置class的类名，否则typeorm无法正确解析设置数据库表名
63
- - 如果有多个连接，则每个连接必须提供name属性，且唯一。name也是entity下的子目录区分。这是entity目录下直接实体将挂在第一个数据库配置连接上。比如连接2使用db2，则entity目录下db2目录下的entity才会绑定给这个连接。
64
- - 如果单个连接，则所有实体entity都会挂在这个连接上，不会按二级目录区分。
65
-
66
-
67
-
68
-
69
- ## Questions & Suggestions
70
-
71
- Please open an issue [here](https://github.com/eggjs/egg/issues).
72
-
73
- ## License
74
-
75
- [MIT](LICENSE)
1
+ # egg-ts-template
2
+
3
+ [![NPM version][npm-image]][npm-url]
4
+ [![build status][travis-image]][travis-url]
5
+ [![Test coverage][codecov-image]][codecov-url]
6
+ [![David deps][david-image]][david-url]
7
+ [![Known Vulnerabilities][snyk-image]][snyk-url]
8
+ [![npm download][download-image]][download-url]
9
+
10
+ [npm-image]: https://img.shields.io/npm/v/egg-ts-template.svg?style=flat-square
11
+ [npm-url]: https://npmjs.org/package/egg-ts-template
12
+ [travis-image]: https://img.shields.io/travis/eggjs/egg-ts-template.svg?style=flat-square
13
+ [travis-url]: https://travis-ci.org/eggjs/egg-ts-template
14
+ [codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-ts-template.svg?style=flat-square
15
+ [codecov-url]: https://codecov.io/github/eggjs/egg-ts-template?branch=master
16
+ [david-image]: https://img.shields.io/david/eggjs/egg-ts-template.svg?style=flat-square
17
+ [david-url]: https://david-dm.org/eggjs/egg-ts-template
18
+ [snyk-image]: https://snyk.io/test/npm/egg-ts-template/badge.svg?style=flat-square
19
+ [snyk-url]: https://snyk.io/test/npm/egg-ts-template
20
+ [download-image]: https://img.shields.io/npm/dm/egg-ts-template.svg?style=flat-square
21
+ [download-url]: https://npmjs.org/package/egg-ts-template
22
+
23
+ <!--
24
+ Description here.
25
+ -->
26
+
27
+ ## Install
28
+
29
+ ```bash
30
+ $ npm i @diyaner/egg-typeorm --save
31
+ ```
32
+
33
+ ## Usage
34
+
35
+ ```js
36
+ // {app_root}/config/plugin.js
37
+ exports.typeorm = {
38
+ enable: true,
39
+ package: '@diyaner/egg-typeorm',
40
+ };
41
+ ```
42
+
43
+ ## Configuration
44
+
45
+ ```js
46
+ // {app_root}/config/config.default.js
47
+ exports.typeorm = {
48
+ agent:true,
49
+ datasources:[
50
+ {...}
51
+ ]
52
+ };
53
+ ```
54
+
55
+ see [config/config.default.js](config/config.default.js) for more detail.
56
+
57
+ ## Example
58
+
59
+ <!-- example here -->
60
+ - 实体entity放在app/entity目录下
61
+ - 实体必须使用默认default导出，这样才能正确使用ets自动类型声明并绑定给app.entity
62
+ - 实体default导出，同时还是必须要设置class的类名，否则typeorm无法正确解析设置数据库表名
63
+ - 如果有多个连接，则每个连接必须提供name属性，且唯一。name也是entity下的子目录区分。这是entity目录下直接实体将挂在第一个数据库配置连接上。比如连接2使用db2，则entity目录下db2目录下的entity才会绑定给这个连接。
64
+ - 如果单个连接，则所有实体entity都会挂在这个连接上，不会按二级目录区分。
65
+
66
+
67
+
68
+
69
+ ## Questions & Suggestions
70
+
71
+ Please open an issue [here](https://github.com/eggjs/egg/issues).
72
+
73
+ ## License
74
+
75
+ [MIT](LICENSE)
package/README.zh_CN.md CHANGED
@@ -1,76 +1,76 @@
1
- # egg-typeorm
2
-
3
- [![NPM version][npm-image]][npm-url]
4
- [![build status][travis-image]][travis-url]
5
- [![Test coverage][codecov-image]][codecov-url]
6
- [![David deps][david-image]][david-url]
7
- [![Known Vulnerabilities][snyk-image]][snyk-url]
8
- [![npm download][download-image]][download-url]
9
-
10
- [npm-image]: https://img.shields.io/npm/v/egg-ts-template.svg?style=flat-square
11
- [npm-url]: https://npmjs.org/package/egg-ts-template
12
- [travis-image]: https://img.shields.io/travis/eggjs/egg-ts-template.svg?style=flat-square
13
- [travis-url]: https://travis-ci.org/eggjs/egg-ts-template
14
- [codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-ts-template.svg?style=flat-square
15
- [codecov-url]: https://codecov.io/github/eggjs/egg-ts-template?branch=master
16
- [david-image]: https://img.shields.io/david/eggjs/egg-ts-template.svg?style=flat-square
17
- [david-url]: https://david-dm.org/eggjs/egg-ts-template
18
- [snyk-image]: https://snyk.io/test/npm/egg-ts-template/badge.svg?style=flat-square
19
- [snyk-url]: https://snyk.io/test/npm/egg-ts-template
20
- [download-image]: https://img.shields.io/npm/dm/egg-ts-template.svg?style=flat-square
21
- [download-url]: https://npmjs.org/package/egg-ts-template
22
-
23
- <!--
24
- Description here.
25
- -->
26
-
27
- ## 依赖说明
28
-
29
- ### 依赖的 egg 版本
30
-
31
- @diyaner/egg-typeorm 版本 | egg 3.x
32
- --- | ---
33
- 1.x | 😁
34
- 0.x | ❌
35
-
36
- ### 依赖的插件
37
- <!--
38
-
39
- 如果有依赖其它插件，请在这里特别说明。如
40
-
41
- - security
42
- - multipart
43
-
44
- -->
45
-
46
- ## 开启插件
47
-
48
- ```js
49
- // config/plugin.js
50
- exports.typeorm = {
51
- enable: true,
52
- package: '@diyaner/egg-typeorm',
53
- };
54
- ```
55
-
56
- ## 使用场景
57
-
58
- - Why and What: 描述为什么会有这个插件，它主要在完成一件什么事情。
59
- 尽可能描述详细。
60
- - How: 描述这个插件是怎样使用的，具体的示例代码，甚至提供一个完整的示例，并给出链接。
61
-
62
- ## 详细配置
63
-
64
- 请到 [config/config.default.js](config/config.default.js) 查看详细配置项说明。
65
-
66
- ## 单元测试
67
-
68
- <!-- 描述如何在单元测试中使用此插件，例如 schedule 如何触发。无则省略。-->
69
-
70
- ## 提问交流
71
-
72
- 请到 [egg issues](https://github.com/eggjs/egg/issues) 异步交流。
73
-
74
- ## License
75
-
76
- [MIT](LICENSE)
1
+ # egg-typeorm
2
+
3
+ [![NPM version][npm-image]][npm-url]
4
+ [![build status][travis-image]][travis-url]
5
+ [![Test coverage][codecov-image]][codecov-url]
6
+ [![David deps][david-image]][david-url]
7
+ [![Known Vulnerabilities][snyk-image]][snyk-url]
8
+ [![npm download][download-image]][download-url]
9
+
10
+ [npm-image]: https://img.shields.io/npm/v/egg-ts-template.svg?style=flat-square
11
+ [npm-url]: https://npmjs.org/package/egg-ts-template
12
+ [travis-image]: https://img.shields.io/travis/eggjs/egg-ts-template.svg?style=flat-square
13
+ [travis-url]: https://travis-ci.org/eggjs/egg-ts-template
14
+ [codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-ts-template.svg?style=flat-square
15
+ [codecov-url]: https://codecov.io/github/eggjs/egg-ts-template?branch=master
16
+ [david-image]: https://img.shields.io/david/eggjs/egg-ts-template.svg?style=flat-square
17
+ [david-url]: https://david-dm.org/eggjs/egg-ts-template
18
+ [snyk-image]: https://snyk.io/test/npm/egg-ts-template/badge.svg?style=flat-square
19
+ [snyk-url]: https://snyk.io/test/npm/egg-ts-template
20
+ [download-image]: https://img.shields.io/npm/dm/egg-ts-template.svg?style=flat-square
21
+ [download-url]: https://npmjs.org/package/egg-ts-template
22
+
23
+ <!--
24
+ Description here.
25
+ -->
26
+
27
+ ## 依赖说明
28
+
29
+ ### 依赖的 egg 版本
30
+
31
+ @diyaner/egg-typeorm 版本 | egg 3.x
32
+ --- | ---
33
+ 1.x | 😁
34
+ 0.x | ❌
35
+
36
+ ### 依赖的插件
37
+ <!--
38
+
39
+ 如果有依赖其它插件，请在这里特别说明。如
40
+
41
+ - security
42
+ - multipart
43
+
44
+ -->
45
+
46
+ ## 开启插件
47
+
48
+ ```js
49
+ // config/plugin.js
50
+ exports.typeorm = {
51
+ enable: true,
52
+ package: '@diyaner/egg-typeorm',
53
+ };
54
+ ```
55
+
56
+ ## 使用场景
57
+
58
+ - Why and What: 描述为什么会有这个插件，它主要在完成一件什么事情。
59
+ 尽可能描述详细。
60
+ - How: 描述这个插件是怎样使用的，具体的示例代码，甚至提供一个完整的示例，并给出链接。
61
+
62
+ ## 详细配置
63
+
64
+ 请到 [config/config.default.js](config/config.default.js) 查看详细配置项说明。
65
+
66
+ ## 单元测试
67
+
68
+ <!-- 描述如何在单元测试中使用此插件，例如 schedule 如何触发。无则省略。-->
69
+
70
+ ## 提问交流
71
+
72
+ 请到 [egg issues](https://github.com/eggjs/egg/issues) 异步交流。
73
+
74
+ ## License
75
+
76
+ [MIT](LICENSE)
package/index.d.ts CHANGED
@@ -1,83 +1,87 @@
1
- /*
2
- * @copyright: Huang Ding
3
- * @Author: ding-cx
4
- * @Date: 2021-02-21 17:47:08
5
- * @LastEditors: ding-cx
6
- * @LastEditTime: 2021-02-21 17:47:51
7
- * @Description: file content
8
- */
9
-
10
- import Egg from "egg";
11
- import * as typeorm from "typeorm";
12
- import { createTypeORMDataSources } from "./lib/connection";
13
- import { EggDataSource } from "./lib/EggDataSource";
14
-
15
- declare module "egg" {
16
- /** egg插件的typeorm的连接选项 */
17
-
18
- /** typeorm 已弃用name属性，暂时加上 */
19
- type EggConfigTypeormDataSourceOptions = {
20
- name?: string;
21
- /** 实体类所在目录名 */
22
- entityDir?: string;
23
- } & typeorm.DataSourceOptions;
24
- interface EggAppConfig {
25
- /** typeorm 数据库连接配置 */
26
- typeorm: {
27
- /** 是否在agent上启用typeorm */
28
- agent: boolean;
29
- datasources: EggConfigTypeormDataSourceOptions[];
30
- };
31
- }
32
-
33
- interface Application {
34
- /** 绑定所有typeorm的导出，并添加连接实例map */
35
- typeorm: {
36
- typeORM: typeof typeorm;
37
- /** 数据库连接实例 其key为配置时的name属性 */
38
- datasources: {
39
- [key: string]: EggDataSource;
40
- };
41
- /** 绑定实体类列表 */
42
- entites: {
43
- all: any[];
44
- /**
45
- * 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
46
- */
47
- level1: any[];
48
- /** 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
49
- * - 目录名转为大写，如abc -> ABC
50
- */
51
- dirs: {
52
- [key: string]: any[];
53
- };
54
- };
55
- /** 挂载app上，可动态创建typeORM实例 */
56
- createTypeORMDataSources: typeof createTypeORMDataSources;
57
- };
58
- }
59
-
60
- interface Agent {
61
- /** 绑定所有typeorm的导出，并添加连接实例map */
62
- typeorm: {
63
- typeORM: typeof typeorm;
64
- /** 数据库连接实例 其key为配置时的name属性 */
65
- datasources: {
66
- [key: string]: EggDataSource;
67
- };
68
- /** 绑定实体类列表 */
69
- entites: {
70
- all: any[];
71
- // 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
72
- level1: any[];
73
- // 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
74
- dirs: {
75
- [key: string]: any[];
76
- };
77
- };
78
- /** 挂载app上，可动态创建typeORM实例 */
79
- createTypeORMDataSources: typeof createTypeORMDataSources;
80
- };
81
- }
82
- }
83
- export = Egg;
1
+ /*
2
+ * @copyright: Huang Ding
3
+ * @Author: ding-cx
4
+ * @Date: 2021-02-21 17:47:08
5
+ * @LastEditors: ding-cx
6
+ * @LastEditTime: 2021-02-21 17:47:51
7
+ * @Description: file content
8
+ */
9
+
10
+ import Egg from "egg";
11
+ import * as typeorm from "typeorm";
12
+ import { createTypeORMDataSources } from "./lib/connection";
13
+ import { EggDataSource } from "./lib/EggDataSource";
14
+
15
+ declare module "egg" {
16
+ /** egg插件的typeorm的连接选项 */
17
+
18
+ /** typeorm 已弃用name属性，暂时加上 */
19
+ type EggConfigTypeormDataSourceOptions = {
20
+ name?: string;
21
+ /** 实体类所在目录名 */
22
+ entityDir?: string;
23
+ } & typeorm.DataSourceOptions;
24
+ interface EggAppConfig {
25
+ /** typeorm 数据库连接配置 */
26
+ typeorm: {
27
+ /** 是否在agent上启用typeorm */
28
+ agent: boolean;
29
+ datasources: EggConfigTypeormDataSourceOptions[];
30
+ };
31
+ }
32
+
33
+ interface Application {
34
+ /** 绑定所有typeorm的导出，并添加连接实例map */
35
+ typeorm: {
36
+ typeORM: typeof typeorm;
37
+ /** 数据库连接实例 其key为配置时的name属性 */
38
+ datasources: {
39
+ [key: string]: EggDataSource;
40
+ };
41
+ /** 绑定实体类列表 */
42
+ entites: {
43
+ all: any[];
44
+ /**
45
+ * 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
46
+ */
47
+ level1: any[];
48
+ /** 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
49
+ * - 目录名转为大写，如abc -> ABC
50
+ */
51
+ dirs: {
52
+ [key: string]: any[];
53
+ };
54
+ };
55
+ /** 挂载app上，可动态创建typeORM实例 */
56
+ createTypeORMDataSources: typeof createTypeORMDataSources;
57
+ /** 外部自定义日志类 */
58
+ Logger?: typeorm.Logger;
59
+ };
60
+ }
61
+
62
+ interface Agent {
63
+ /** 绑定所有typeorm的导出，并添加连接实例map */
64
+ typeorm: {
65
+ typeORM: typeof typeorm;
66
+ /** 数据库连接实例 其key为配置时的name属性 */
67
+ datasources: {
68
+ [key: string]: EggDataSource;
69
+ };
70
+ /** 绑定实体类列表 */
71
+ entites: {
72
+ all: any[];
73
+ // 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
74
+ level1: any[];
75
+ // 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
76
+ dirs: {
77
+ [key: string]: any[];
78
+ };
79
+ };
80
+ /** 挂载app上，可动态创建typeORM实例 */
81
+ createTypeORMDataSources: typeof createTypeORMDataSources;
82
+ /** 外部自定义日志类 */
83
+ Logger?: typeorm.Logger;
84
+ };
85
+ }
86
+ }
87
+ export = Egg;
package/lib/EggDataSource.d.ts CHANGED
@@ -1,36 +1,51 @@
1
- import { DataSource, QueryRunner } from "typeorm";
1
+ import { DataSource, EntityTarget, ObjectLiteral, QueryRunner } from "typeorm";
2
2
  /**
3
3
  * custom extend typeorm's DataSource class
4
4
  */
5
5
  export declare class EggDataSource extends DataSource {
6
6
  private eggCustomAddEntityCacheMap;
7
+ /** 手动添加的实体，使用表名map一个class */
8
+ private eggCustomAddEntityTableNameKeyCacheMap;
7
9
  /** 分表添加实体缓存map */
8
10
  private eggCustomAddSplitEntityCacheMap;
9
11
  /**
10
- * 在一个typeorm连接datasource实例上动态添加一个实体类及其metadata
12
+ * 在一个typeorm连接datasource实例上动态添加多个实体类
13
+ * - 适用于需要与内部实体关联（但不能实现内部关联这些新增实体，因内部实体已固定）的场景，每次调用将会很费性能（全部实体metadata重新build）
11
14
  * - 可以实现动态分表，同一实体类的子类，改表名就能对应多个db表等场景
12
15
  * - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
13
16
  * - 类上可定义属性name2,处理源码被压缩情况下类名丢失问题
14
17
  */
15
- addEntity<T extends Function>(classes: T): Promise<this>;
18
+ addEntities<T extends Function>(...classList: (T | T[])[]): Promise<this>;
16
19
  /**
17
- * 在一个typeorm连接datasource实例上动态添加一个或多个实体类及其metadata
20
+ * 在一个typeorm连接datasource实例上动态添加多个实体类及其metadata，
21
+ * - 适用于与内部实体类无关联的场景，本次批量添加的实体类之间可以互相关联
22
+ * - 添加前会清除同名表的已存在实体类
23
+ * - 与addEntities方法不同，它不会导致全部metadata重新build，因此性能开销较小
18
24
  *
19
25
  * - 可以实现动态分表，同一实体类的子类，改表名就能对应多个db表等场景
20
26
  *
21
27
  * - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
22
28
  */
23
- addEntities<T extends Function>(...classess: T[]): Promise<this>;
24
- /** 一个实体类来构建元数据，这个只适合无关联关系的单个类，表 */
29
+ addEntitiesAlone<T extends Function>(...classess: T[]): Promise<this>;
30
+ /** 多个实体类来构建元数据，本次批量构建的元数据可以实现相互关联 */
25
31
  private buildMetaData2;
26
32
  /** 移除一个ds上的某个类实体 */
27
- removeEntity<T extends Function>(clz: T): void;
33
+ removeEntity<T extends Function>(clz: T): this;
34
+ /** 通过用户表名或内部生成表名删除一个实体 仅限egg自定义添加的实体 */
35
+ removeEntityByTableName(tableName: string): this;
28
36
  /** query方法，支持查询语句转义 :params */
29
37
  query2<T = any>(query: string, parameters: Record<string, any>, queryRunner?: QueryRunner): Promise<T>;
30
38
  /** 使用一个现有entity进行模型分表
31
39
  * - 注意，同一个分表entity不应反复调用，否则产生多个相同class，造成OOM
32
40
  * - 原始实体必须已经存在在datasource中，否则会报错
33
- * - 与原始实体不同的是，它关联的toOne实体身上并未关联本实体（还是关联的原始实体），因此查询时不能使用oneToMany关系关联本实体的数据。只能本实体为主查询
41
+ * - 与原始实体不同的是，它关联的toOne实体身上并未关联本实体（还是关联的原始实体），因此查询时不能使用oneToMany关系关联本实体的数据。只能以本实体为主查询
42
+ * @param CLZ 原实体类
43
+ * @param tableName 新表名(或后缀)
44
+ * @param isSubfix 是否为后缀
34
45
  */
35
- getSplitTableEntity<T extends Function>(clz: T, tableName: string, isSubfix?: boolean): Promise<T>;
46
+ getShardingEntity<T extends Function>(CLZ: T, tableName: string, isSubfix?: boolean): Promise<T>;
47
+ /** 从素对象创建实体实例对象
48
+ * - 解决typeorm内部未处理Date, Json等类型的问题
49
+ */
50
+ createEntityInstance<T extends ObjectLiteral>(entityClass: EntityTarget<T>, plainObject: any): T;
36
51
  }
package/lib/EggDataSource.js CHANGED
@@ -13,27 +13,36 @@ class EggDataSource extends typeorm_1.DataSource {
13
13
  constructor() {
14
14
  super(...arguments);
15
15
  this.eggCustomAddEntityCacheMap = new Map();
16
+ /** 手动添加的实体，使用表名map一个class */
17
+ this.eggCustomAddEntityTableNameKeyCacheMap = new Map();
16
18
  /** 分表添加实体缓存map */
17
19
  this.eggCustomAddSplitEntityCacheMap = new Map();
18
20
  }
19
21
  /**
20
- * 在一个typeorm连接datasource实例上动态添加一个实体类及其metadata
22
+ * 在一个typeorm连接datasource实例上动态添加多个实体类
23
+ * - 适用于需要与内部实体关联（但不能实现内部关联这些新增实体，因内部实体已固定）的场景，每次调用将会很费性能（全部实体metadata重新build）
21
24
  * - 可以实现动态分表，同一实体类的子类，改表名就能对应多个db表等场景
22
25
  * - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
23
26
  * - 类上可定义属性name2,处理源码被压缩情况下类名丢失问题
24
27
  */
25
- async addEntity(classes) {
26
- const entityCacheClz = this.eggCustomAddEntityCacheMap.get(classes);
27
- if (entityCacheClz) {
28
+ async addEntities(...classList) {
29
+ let classess = classList.reduce((prev, curr) => {
30
+ const a = Array.isArray(curr) ? curr : [curr];
31
+ prev.push(...a);
32
+ return prev;
33
+ }, []);
34
+ classess = classess.filter((item) => !this.eggCustomAddEntityCacheMap.get(item));
35
+ if (classess.length === 0)
28
36
  return this;
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
+ for (const classes of classess) {
38
+ // @ts-ignore name2 for 源码压缩场景，可重新定义类名
39
+ if (classes.name2) {
40
+ Object.defineProperty(classes, "name", {
41
+ writable: true,
42
+ });
43
+ // @ts-ignore
44
+ classes.name = classes.name2;
45
+ }
37
46
  }
38
47
  // 因typeorm底层实现需要所有entities一起解析实现关联关系。因此只能全部entities重新build
39
48
  let existedEntities = this.options.entities;
@@ -41,38 +50,73 @@ class EggDataSource extends typeorm_1.DataSource {
41
50
  existedEntities = [];
42
51
  }
43
52
  if (Array.isArray(existedEntities)) {
44
- existedEntities.push(classes);
53
+ existedEntities.push(...classess);
45
54
  }
46
55
  else {
47
- existedEntities[classes.name] = classes;
56
+ for (const classes of classess) {
57
+ existedEntities[classes.name] = classes;
58
+ }
48
59
  }
49
- await this.buildMetadatas(); // 与连接初始化时一致，根据所有实体类构建元数据。添加单个实体这里调用，将会很费性能，且可能由于关联关系问题报错。
60
+ await this.buildMetadatas(); // 与连接初始化时一致，根据所有实体类构建元数据。添加新实体后跟所有老实体一起重新构建metadata，将会很费性能，且可能由于关联关系问题报错。
50
61
  // 不全部重新build，只单个类，但又无法实现关联关系
51
62
  // await this.buildMetaData2(classes);
52
- this.eggCustomAddEntityCacheMap.set(classes, true);
63
+ for (const classes of classess) {
64
+ this.eggCustomAddEntityCacheMap.set(classes, true);
65
+ const metadata = this.entityMetadatasMap.get(classes);
66
+ if (metadata) {
67
+ this.eggCustomAddEntityTableNameKeyCacheMap.set(metadata.givenTableName || metadata.tableName, classes);
68
+ }
69
+ }
53
70
  return this;
54
71
  }
55
72
  /**
56
- * 在一个typeorm连接datasource实例上动态添加一个或多个实体类及其metadata
73
+ * 在一个typeorm连接datasource实例上动态添加多个实体类及其metadata，
74
+ * - 适用于与内部实体类无关联的场景，本次批量添加的实体类之间可以互相关联
75
+ * - 添加前会清除同名表的已存在实体类
76
+ * - 与addEntities方法不同，它不会导致全部metadata重新build，因此性能开销较小
57
77
  *
58
78
  * - 可以实现动态分表，同一实体类的子类，改表名就能对应多个db表等场景
59
79
  *
60
80
  * - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
61
81
  */
62
- async addEntities(...classess) {
82
+ async addEntitiesAlone(...classess) {
63
83
  for (const classes of classess) {
64
- await this.addEntity(classes);
84
+ // @ts-ignore name2 for 源码压缩场景，可重新定义类名
85
+ if (classes.name2) {
86
+ Object.defineProperty(classes, "name", {
87
+ writable: true,
88
+ });
89
+ // @ts-ignore
90
+ classes.name = classes.name2;
91
+ }
92
+ }
93
+ const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
94
+ const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
95
+ // build entity metadatas
96
+ const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas([...classess]);
97
+ for (const metadata of entityMetadatas) {
98
+ this.removeEntityByTableName(metadata.givenTableName || metadata.tableName);
99
+ this.entityMetadatas.push(metadata);
100
+ this.entityMetadatasMap.set(metadata.target, metadata);
101
+ this.eggCustomAddEntityCacheMap.set(metadata.target, true);
102
+ this.eggCustomAddEntityTableNameKeyCacheMap.set(metadata.givenTableName || metadata.tableName, metadata.target);
103
+ }
104
+ // validate all created entity metadatas to make sure user created entities are valid and correct
105
+ entityMetadataValidator.validateMany(entityMetadatas, this.driver);
106
+ // set current data source to the entities
107
+ for (let entityMetadata of entityMetadatas) {
108
+ if (typeorm_1.InstanceChecker.isBaseEntityConstructor(entityMetadata.target)) {
109
+ entityMetadata.target.useDataSource(this);
110
+ }
65
111
  }
66
- // 不全部重新build，只单个类，但又无法实现关联关系
67
- // await this.buildMetaData2(classes);
68
112
  return this;
69
113
  }
70
- /** 一个实体类来构建元数据，这个只适合无关联关系的单个类，表 */
71
- async buildMetaData2(entity) {
114
+ /** 多个实体类来构建元数据，本次批量构建的元数据可以实现相互关联 */
115
+ async buildMetaData2(...entities) {
72
116
  const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
73
117
  const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
74
118
  // build entity metadatas
75
- const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas([entity]);
119
+ const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas([...entities]);
76
120
  for (const metadata of entityMetadatas) {
77
121
  this.entityMetadatas.push(metadata);
78
122
  this.entityMetadatasMap.set(metadata.target, metadata);
@@ -90,6 +134,9 @@ class EggDataSource extends typeorm_1.DataSource {
90
134
  removeEntity(clz) {
91
135
  this.eggCustomAddEntityCacheMap.delete(clz);
92
136
  const metadata = this.entityMetadatasMap.get(clz);
137
+ if (metadata) {
138
+ this.eggCustomAddEntityTableNameKeyCacheMap.delete(metadata.givenTableName || metadata.tableName);
139
+ }
93
140
  if (metadata && typeorm_1.InstanceChecker.isBaseEntityConstructor(metadata.target)) {
94
141
  // @ts-ignore
95
142
  metadata.target.dataSource = null;
@@ -97,6 +144,15 @@ class EggDataSource extends typeorm_1.DataSource {
97
144
  // @ts-ignore entityMetadatas 是只读属性
98
145
  this.entityMetadatas = this.entityMetadatas.filter((item) => item.target !== clz);
99
146
  this.entityMetadatasMap.delete(clz);
147
+ return this;
148
+ }
149
+ /** 通过用户表名或内部生成表名删除一个实体 仅限egg自定义添加的实体 */
150
+ removeEntityByTableName(tableName) {
151
+ const clz = this.eggCustomAddEntityTableNameKeyCacheMap.get(tableName);
152
+ if (clz) {
153
+ this.removeEntity(clz);
154
+ }
155
+ return this;
100
156
  }
101
157
  /** query方法，支持查询语句转义 :params */
102
158
  async query2(query, parameters, queryRunner) {
@@ -106,27 +162,70 @@ class EggDataSource extends typeorm_1.DataSource {
106
162
  /** 使用一个现有entity进行模型分表
107
163
  * - 注意，同一个分表entity不应反复调用，否则产生多个相同class，造成OOM
108
164
  * - 原始实体必须已经存在在datasource中，否则会报错
109
- * - 与原始实体不同的是，它关联的toOne实体身上并未关联本实体（还是关联的原始实体），因此查询时不能使用oneToMany关系关联本实体的数据。只能本实体为主查询
165
+ * - 与原始实体不同的是，它关联的toOne实体身上并未关联本实体（还是关联的原始实体），因此查询时不能使用oneToMany关系关联本实体的数据。只能以本实体为主查询
166
+ * @param CLZ 原实体类
167
+ * @param tableName 新表名(或后缀)
168
+ * @param isSubfix 是否为后缀
110
169
  */
111
- async getSplitTableEntity(clz, tableName, isSubfix = false) {
112
- const meta = this.getMetadata(clz);
170
+ async getShardingEntity(CLZ, tableName, isSubfix = false) {
171
+ const meta = this.getMetadata(CLZ);
113
172
  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;
173
+ throw new Error(`entity ${CLZ.name} not found in datasource ${this.name}`);
174
+ const name = isSubfix ? `${meta.givenTableName || meta.name || CLZ.name}_${tableName}` : tableName;
116
175
  const CacheClasses = this.eggCustomAddSplitEntityCacheMap.get(name);
117
176
  if (CacheClasses) {
118
177
  return CacheClasses;
119
178
  }
120
- let Classes = class Classes extends clz {
179
+ let Classes = class Classes extends CLZ {
121
180
  };
122
181
  Classes = tslib_1.__decorate([
123
182
  (0, typeorm_1.Entity)({ name, comment: meta.comment || "" })
124
183
  ], Classes);
125
184
  Classes.name2 = name;
126
- await this.addEntity(Classes);
185
+ await this.addEntities(Classes);
127
186
  this.eggCustomAddSplitEntityCacheMap.set(name, Classes);
128
187
  return Classes;
129
188
  }
189
+ /** 从素对象创建实体实例对象
190
+ * - 解决typeorm内部未处理Date, Json等类型的问题
191
+ */
192
+ createEntityInstance(entityClass, plainObject) {
193
+ const instance = this.manager.create(entityClass, plainObject);
194
+ const metadata = this.getMetadata(entityClass);
195
+ if (metadata && metadata.columns) {
196
+ for (const column of metadata.columns) {
197
+ if (column.type === "datetime") {
198
+ let value = plainObject[column.propertyName] ? new Date(plainObject[column.propertyName]) : null;
199
+ if (value && value.toString() === "Invalid Date") {
200
+ value = null;
201
+ }
202
+ // @ts-ignore
203
+ instance[column.propertyName] = value;
204
+ }
205
+ else if (column.type === "simple-json") {
206
+ const value = plainObject[column.propertyName];
207
+ if (value && typeof value === "string") {
208
+ try {
209
+ // @ts-ignore
210
+ instance[column.propertyName] = JSON.parse(value);
211
+ }
212
+ catch (error) {
213
+ // @ts-ignore
214
+ instance[column.propertyName] = null;
215
+ }
216
+ }
217
+ }
218
+ else if (column.type === "simple-array") {
219
+ const value = plainObject[column.propertyName];
220
+ if (value && typeof value === "string") {
221
+ // @ts-ignore
222
+ instance[column.propertyName] = value.split(",");
223
+ }
224
+ }
225
+ }
226
+ }
227
+ return instance;
228
+ }
130
229
  }
131
230
  exports.EggDataSource = EggDataSource;
132
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLHFDQUEyRTtBQUMzRSw0RkFBeUY7QUFDekYsOEZBQTJGO0FBQzNGLDBEQUEwRDtBQUUxRDs7R0FFRztBQUNILE1BQWEsYUFBYyxTQUFRLG9CQUFVO0lBQTdDOztRQUNTLCtCQUEwQixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO1FBQy9ELGtCQUFrQjtRQUNWLG9DQUErQixHQUFHLElBQUksR0FBRyxFQUFvQixDQUFDO0lBMkh2RSxDQUFDO0lBMUhBOzs7OztPQUtHO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsT0FBVTtRQUM3QyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3BFLElBQUksY0FBYyxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDYixDQUFDO1FBRUQsc0NBQXNDO1FBQ3RDLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25CLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRTtnQkFDdEMsUUFBUSxFQUFFLElBQUk7YUFDZCxDQUFDLENBQUM7WUFDSCxhQUFhO1lBQ2IsT0FBTyxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO1FBQzlCLENBQUM7UUFFRCwyREFBMkQ7UUFDM0QsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFFNUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3RCLGVBQWUsR0FBRyxFQUFFLENBQUM7UUFDdEIsQ0FBQztRQUVELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQ3BDLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7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
231
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":";;;;AAAA,qCAAwG;AACxG,4FAAyF;AACzF,8FAA2F;AAC3F,0DAA0D;AAE1D;;GAEG;AACH,MAAa,aAAc,SAAQ,oBAAU;IAA7C;;QACS,+BAA0B,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC/D,6BAA6B;QACrB,2CAAsC,GAAG,IAAI,GAAG,EAAoB,CAAC;QAE7E,kBAAkB;QACV,oCAA+B,GAAG,IAAI,GAAG,EAAoB,CAAC;IAgOvE,CAAC;IA/NA;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAqB,GAAG,SAAsB;QAC9D,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,IAAI,EAAE,EAAE;YACnD,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAChB,OAAO,IAAI,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACjF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,sCAAsC;YACtC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE;oBACtC,QAAQ,EAAE,IAAI;iBACd,CAAC,CAAC;gBACH,aAAa;gBACb,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC;YAC9B,CAAC;QACF,CAAC;QAED,2DAA2D;QAC3D,IAAI,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAE5C,IAAI,CAAC,eAAe,EAAE,CAAC;YACtB,eAAe,GAAG,EAAE,CAAC;QACtB,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,eAAe,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACP,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAChC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;YACzC,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,0EAA0E;QAEvG,6BAA6B;QAC7B,sCAAsC;QACtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtD,IAAI,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,sCAAsC,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACzG,CAAC;QACF,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,gBAAgB,CAAqB,GAAG,QAAa;QAC1D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,sCAAsC;YACtC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE;oBACtC,QAAQ,EAAE,IAAI;iBACd,CAAC,CAAC;gBACH,aAAa;gBACb,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC;YAC9B,CAAC;QACF,CAAC;QAED,MAAM,yBAAyB,GAAG,IAAI,qDAAyB,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;QAE9D,yBAAyB;QACzB,MAAM,eAAe,GAAG,MAAM,yBAAyB,CAAC,oBAAoB,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;QAC5F,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;YACxC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACvD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAa,EAAE,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,sCAAsC,CAAC,GAAG,CAC9C,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,SAAS,EAC7C,QAAQ,CAAC,MAAa,CACtB,CAAC;QACH,CAAC;QAED,iGAAiG;QACjG,uBAAuB,CAAC,YAAY,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnE,0CAA0C;QAC1C,KAAK,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;YAC5C,IAAI,yBAAe,CAAC,uBAAuB,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpE,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qCAAqC;IAC7B,KAAK,CAAC,cAAc,CAAC,GAAG,QAAoB;QACnD,MAAM,yBAAyB,GAAG,IAAI,qDAAyB,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;QAE9D,yBAAyB;QACzB,MAAM,eAAe,GAAG,MAAM,yBAAyB,CAAC,oBAAoB,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;QAC5F,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxD,CAAC;QAED,iGAAiG;QACjG,uBAAuB,CAAC,YAAY,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnE,0CAA0C;QAC1C,KAAK,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;YAC5C,IAAI,yBAAe,CAAC,uBAAuB,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpE,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC;IACF,CAAC;IAED,oBAAoB;IACpB,YAAY,CAAqB,GAAM;QACtC,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,sCAAsC,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnG,CAAC;QACD,IAAI,QAAQ,IAAI,yBAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1E,aAAa;YACb,QAAQ,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QACnC,CAAC;QACD,mCAAmC;QACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;QAClF,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,wCAAwC;IACxC,uBAAuB,CAAC,SAAiB;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,sCAAsC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvE,IAAI,GAAG,EAAE,CAAC;YACT,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,+BAA+B;IAC/B,KAAK,CAAC,MAAM,CAAU,KAAa,EAAE,UAA+B,EAAE,WAAyB;QAC9F,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAC5E,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;OAOG;IACG,AAAN,KAAK,CAAC,iBAAiB,CAAqB,GAAM,EAAE,SAAiB,EAAE,QAAQ,GAAG,KAAK;QACtF,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,4BAA4B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtF,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnG,MAAM,YAAY,GAAG,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,YAAY,EAAE,CAAC;YAClB,OAAO,YAA4B,CAAC;QACrC,CAAC;QAED,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAS,GAAW;SAAG,CAAA;QAA/B,OAAO;YADZ,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;WACxC,OAAO,CAAwB;QACrC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;QACrB,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,OAAuB,CAAC;IAChC,CAAC;IACD;;OAEG;IACH,oBAAoB,CAA0B,WAA4B,EAAE,WAAgB;QAC3F,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YAClC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACvC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAChC,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBACjG,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,cAAc,EAAE,CAAC;wBAClD,KAAK,GAAG,IAAI,CAAC;oBACd,CAAC;oBACD,aAAa;oBACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC1C,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAC/C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACxC,IAAI,CAAC;4BACJ,aAAa;4BACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACnD,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BAChB,aAAa;4BACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;wBACtC,CAAC;oBACF,CAAC;gBACF,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBAC3C,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAC/C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACxC,aAAa;wBACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAClD,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,QAAwB,CAAC;IACjC,CAAC;CACD;AAtOD,sCAsOC"}
package/lib/Logger.js CHANGED
@@ -13,10 +13,10 @@ class EggTypeORMLogger {
13
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(`[Egg-TypeORM logQueryError] %s\r\n%s\r\n%j`, query, error, parameters);
16
+ this.app.coreLogger.error(`%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 SLOW SQL] %s \r\n%s \r\n%j`, time, query, parameters);
19
+ this.app.coreLogger.warn(`[Egg-TypeORM Logger slow sql] %s \r\n%s \r\n%j`, time, query, parameters);
20
20
  }
21
21
  // @ts-ignore
22
22
  logSchemaBuild(message, queryRunner) {
@@ -31,4 +31,4 @@ class EggTypeORMLogger {
31
31
  }
32
32
  }
33
33
  exports.default = EggTypeORMLogger;
34
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQXdCO1FBQXhCLFFBQUcsR0FBSCxHQUFHLENBQXFCO1FBb0I1QyxjQUFTLEdBQUc7WUFDWCxHQUFHLEVBQUUsTUFBTTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osSUFBSSxFQUFFLE1BQU07U0FDWixDQUFDO0lBeEI2QyxDQUFDO0lBQ2hELFFBQVEsQ0FBQyxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUM3RixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsa0NBQWtDLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFDRCxhQUFhLENBQUMsS0FBcUIsRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUN6SCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsNENBQTRDLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNuRyxDQUFDO0lBQ0QsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUMvRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMseUNBQXlDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUM5RixDQUFDO0lBRUQsYUFBYTtJQUNiLGNBQWMsQ0FBQyxPQUFlLEVBQUUsV0FBcUM7UUFDcEUsOENBQThDO0lBQy9DLENBQUM7SUFDRCxhQUFhO0lBQ2IsWUFBWSxDQUFDLE9BQWUsRUFBRSxXQUFxQztRQUNsRSw4Q0FBOEM7SUFDL0MsQ0FBQztJQVFELEdBQUcsQ0FBQyxLQUE4QixFQUFFLE9BQVksRUFBRSxXQUFxQztRQUN0RixJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakQsQ0FBQztDQUNEO0FBOUJELG1DQThCQyJ9
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQXdCO1FBQXhCLFFBQUcsR0FBSCxHQUFHLENBQXFCO1FBb0I1QyxjQUFTLEdBQUc7WUFDWCxHQUFHLEVBQUUsTUFBTTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osSUFBSSxFQUFFLE1BQU07U0FDWixDQUFDO0lBeEI2QyxDQUFDO0lBQ2hELFFBQVEsQ0FBQyxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUM3RixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsa0NBQWtDLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFDRCxhQUFhLENBQUMsS0FBcUIsRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUN6SCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBQ0QsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUMvRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0RBQWdELEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNyRyxDQUFDO0lBRUQsYUFBYTtJQUNiLGNBQWMsQ0FBQyxPQUFlLEVBQUUsV0FBcUM7UUFDcEUsOENBQThDO0lBQy9DLENBQUM7SUFDRCxhQUFhO0lBQ2IsWUFBWSxDQUFDLE9BQWUsRUFBRSxXQUFxQztRQUNsRSw4Q0FBOEM7SUFDL0MsQ0FBQztJQVFELEdBQUcsQ0FBQyxLQUE4QixFQUFFLE9BQVksRUFBRSxXQUFxQztRQUN0RixJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakQsQ0FBQztDQUNEO0FBOUJELG1DQThCQyJ9
package/lib/connection.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createTypeORMDataSources = void 0;
3
+ exports.default = default_1;
4
+ exports.createTypeORMDataSources = createTypeORMDataSources;
4
5
  const util = require("util");
5
6
  const Logger_1 = require("./Logger");
6
7
  const assert = require("assert");
@@ -52,11 +53,12 @@ async function default_1(app) {
52
53
  }
53
54
  }
54
55
  }
55
- exports.default = default_1;
56
56
  async function createTypeORMDataSources(app, datasourcesConfig, entities) {
57
+ // 留个外部可自定义logger的窗口app.typeorm.Logger
58
+ const Logger = app.typeorm.Logger || Logger_1.default;
57
59
  // set logger if user do not provide
58
60
  if (datasourcesConfig.logger === undefined) {
59
- datasourcesConfig.logger = new Logger_1.default(app);
61
+ datasourcesConfig.logger = new Logger(app);
60
62
  }
61
63
  if (entities) {
62
64
  datasourcesConfig.entities = entities;
@@ -75,5 +77,4 @@ async function createTypeORMDataSources(app, datasourcesConfig, entities) {
75
77
  }
76
78
  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));
77
79
  }
78
- exports.createTypeORMDataSources = createTypeORMDataSources;
79
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakIsYUFBYTtnQkFDYixJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDaEUsQ0FBQztRQUNGLENBQUMsQ0FBQyxDQUFDO0lBQ0osQ0FBQztTQUFNLENBQUM7UUFDUCx1QkFBdUI7UUFDdEIsTUFBTSxDQUFDLENBQUMsQ0FBUyxDQUFDLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFhLEVBQUUsQ0FBQztJQUUzQixLQUFLLE1BQU0sSUFBSSxJQUFJLE1BQU0sRUFBRSxDQUFDO1FBQzNCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxTQUFTLENBQUM7UUFDbkMsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQy9CLE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLElBQUksQ0FBQyxJQUFJLG1CQUFtQixDQUFDLENBQUM7UUFDN0YsQ0FBQztRQUNELEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RCLElBQUksQ0FBQztZQUNKLE1BQU0sR0FBRyxHQUFHLE1BQU0sd0JBQXdCLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3RELEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLENBQUMsVUFBVSxDQUFDO1lBQ3BELEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLG9EQUFvRCxFQUFHLElBQVksQ0FBQyxJQUFJLEVBQUcsSUFBWSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDOUgsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDZCxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxtRUFBbUUsRUFBRyxJQUFZLENBQUMsSUFBSSxFQUFHLElBQVksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztZQUNsSixVQUFVLENBQUMsR0FBRyxFQUFFO2dCQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakIsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ1QsQ0FBQztJQUNGLENBQUM7QUFDRixDQUFDO0FBN0NELDRCQTZDQztBQUVNLEtBQUssVUFBVSx3QkFBd0IsQ0FBQyxHQUF3QixFQUFFLGlCQUFvRCxFQUFFLFFBQWdCO0lBQzlJLG9DQUFvQztJQUNwQyxJQUFJLGlCQUFpQixDQUFDLE1BQU0sS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMzQyxpQkFBeUIsQ0FBQyxNQUFNLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBQ0QsSUFBSSxRQUFRLEVBQUUsQ0FBQztRQUNiLGlCQUF5QixDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDaEQsQ0FBQztJQUNELE1BQU0sRUFBRSxHQUFHLElBQUksNkJBQWEsQ0FBQyxpQkFBc0MsQ0FBQyxDQUFDO0lBRXJFLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUM1QixJQUFJLENBQUM7WUFDSixNQUFNLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUN0QixPQUFPLEVBQUUsTUFBTSxFQUFFLGlCQUFpQixFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUN0RCxDQUFDO1FBQUMsT0FBTyxLQUFVLEVBQUUsQ0FBQztZQUNyQixHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FDbkIsbUVBQW1FLEVBQ2xFLGlCQUF5QixDQUFDLElBQUksRUFDOUIsaUJBQXlCLENBQUMsSUFBSSxFQUMvQixpQkFBaUIsQ0FBQyxJQUFJLEVBQ3RCLEtBQUssQ0FBQyxPQUFPLENBQ2IsQ0FBQztZQUNGLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUNsQiwrREFBK0QsRUFDOUQsaUJBQXlCLENBQUMsSUFBSSxFQUM5QixpQkFBeUIsQ0FBQyxJQUFJLEVBQy9CLGlCQUFpQixDQUFDLElBQUksQ0FDdEIsQ0FBQztZQUVGLE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUMzRCxDQUFDO0lBQ0YsQ0FBQztJQUNELE1BQU0sSUFBSSxLQUFLLENBQ2QsSUFBSSxDQUFDLE1BQU0sQ0FDViwrRUFBK0UsRUFDOUUsaUJBQXlCLENBQUMsSUFBSSxFQUM5QixpQkFBeUIsQ0FBQyxJQUFJLEVBQy9CLGlCQUFpQixDQUFDLElBQUksQ0FDdEIsQ0FDRCxDQUFDO0FBQ0gsQ0FBQztBQXhDRCw0REF3Q0MifQ==
80
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFXQSw0QkE2Q0M7QUFFRCw0REEyQ0M7QUFwR0QsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVB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
package/package.json CHANGED
@@ -1,64 +1,64 @@
1
- {
2
- "name": "@diyaner/egg-typeorm",
3
- "version": "2.3.1",
4
- "description": "egg plugin for nodejs orm freamwork typeorm.",
5
- "eggPlugin": {
6
- "name": "typeorm"
7
- },
8
- "keywords": [
9
- "egg",
10
- "eggPlugin",
11
- "egg-plugin",
12
- "egg-typeorm",
13
- "typeorm"
14
- ],
15
- "dependencies": {
16
- "reflect-metadata": "^0.1.13",
17
- "typeorm": "^0.3.20"
18
- },
19
- "devDependencies": {
20
- "@types/mocha": "^8.2.1",
21
- "autod": "^3.0.1",
22
- "autod-egg": "^1.1.0",
23
- "egg": "^3.23.0",
24
- "egg-bin": "^6.9.0",
25
- "egg-ci": "^1.11.0",
26
- "egg-mock": "^3.21.0",
27
- "eslint": "^5.13.0",
28
- "eslint-config-egg": "^7.1.0",
29
- "mysql2": "^3.9.7",
30
- "typescript": "^5.4.5"
31
- },
32
- "engines": {
33
- "node": ">=16.0.0"
34
- },
35
- "scripts": {
36
- "test": "npm run lint -- --fix && npm run test-local",
37
- "test-local": "egg-bin test && npm run clean:js",
38
- "tsc": "tsc",
39
- "clean:js": "tsc -b --clean",
40
- "release": "tsc && npm publish --access public && npm run clean:js",
41
- "cov": "egg-bin cov",
42
- "lint": "eslint .",
43
- "ci": "egg-bin pkgfiles --check && npm run lint && npm run cov",
44
- "pkgfiles": "egg-bin pkgfiles",
45
- "autod": "autod"
46
- },
47
- "files": [
48
- "app.js",
49
- "agent.js",
50
- "tshelper.js",
51
- "config/**/*.js",
52
- "app/**/*.js",
53
- "lib/**/*.js",
54
- "lib/**/*.d.ts",
55
- "typeorm.js",
56
- "typeorm.d.ts",
57
- "index.d.ts"
58
- ],
59
- "ci": {
60
- "version": "8, 10"
61
- },
62
- "author": "ding",
63
- "license": "MIT"
64
- }
1
+ {
2
+ "name": "@diyaner/egg-typeorm",
3
+ "version": "2.5.0",
4
+ "description": "egg plugin for nodejs orm freamwork typeorm.",
5
+ "eggPlugin": {
6
+ "name": "typeorm"
7
+ },
8
+ "keywords": [
9
+ "egg",
10
+ "eggPlugin",
11
+ "egg-plugin",
12
+ "egg-typeorm",
13
+ "typeorm"
14
+ ],
15
+ "dependencies": {
16
+ "reflect-metadata": "^0.1.14",
17
+ "typeorm": "^0.3.25"
18
+ },
19
+ "devDependencies": {
20
+ "@types/mocha": "^8.2.1",
21
+ "autod": "^3.0.1",
22
+ "autod-egg": "^1.1.0",
23
+ "egg": "^3.23.0",
24
+ "egg-bin": "^6.9.0",
25
+ "egg-ci": "^1.11.0",
26
+ "egg-mock": "^5.15.2",
27
+ "eslint": "^5.13.0",
28
+ "eslint-config-egg": "^7.1.0",
29
+ "mysql2": "^3.9.7",
30
+ "typescript": "^5.4.5"
31
+ },
32
+ "engines": {
33
+ "node": ">=16.0.0"
34
+ },
35
+ "scripts": {
36
+ "test": "npm run lint -- --fix && npm run test-local",
37
+ "test-local": "nvs use 20 && egg-bin test && npm run clean:js",
38
+ "tsc": "tsc",
39
+ "clean:js": "tsc -b --clean",
40
+ "release": "tsc && npm publish --access public && npm run clean:js",
41
+ "cov": "egg-bin cov",
42
+ "lint": "eslint .",
43
+ "ci": "egg-bin pkgfiles --check && npm run lint && npm run cov",
44
+ "pkgfiles": "egg-bin pkgfiles",
45
+ "autod": "autod"
46
+ },
47
+ "files": [
48
+ "app.js",
49
+ "agent.js",
50
+ "tshelper.js",
51
+ "config/**/*.js",
52
+ "app/**/*.js",
53
+ "lib/**/*.js",
54
+ "lib/**/*.d.ts",
55
+ "typeorm.js",
56
+ "typeorm.d.ts",
57
+ "index.d.ts"
58
+ ],
59
+ "ci": {
60
+ "version": "8, 10"
61
+ },
62
+ "author": "ding",
63
+ "license": "MIT"
64
+ }
package/tshelper.js CHANGED
@@ -1,50 +1,50 @@
1
- 'use strict';
2
- // const ClassGenerator = require("egg-ts-helper/dist/generators/class").default;
3
- module.exports = {
4
- watchDirs: {
5
- entity: {
6
- directory: 'app/entity',
7
- generator: 'object',
8
- interface: 'IEntity',
9
- declareTo: 'Application.entity',
10
- caseStyle: "upper",
11
- watch: true,
12
- distName: 'entity.d.ts',
13
- },
14
- },
15
- generatorConfig: {
16
- entity: {
17
- directory: 'app/entity',
18
- generator: 'object',
19
- interface: 'IEntity',
20
- declareTo: 'Application.entity',
21
- caseStyle: "upper",
22
- watch: true,
23
- distName: 'entity.d.ts',
24
- },
25
- },
26
- };
27
-
28
-
29
-
30
- /**
31
- * 插件提供的接口方式为、1直接提供类，2提供一个函数，函数返回类
32
- * - 使用这种自定义方式进行类型提取
33
- */
34
- function TypeOrmEntityGenerator(config, baseConfig) {
35
- config.interfaceHandle = config.interfaceHandle || 'AutoTypeOfObject<typeof {{ 0 }}>';
36
-
37
- const result = ClassGenerator(config, baseConfig);
38
- /* istanbul ignore else */
39
- if (result.content) {
40
- result.content = [
41
- 'type AnyClass = new (...args: any[]) => any;',
42
- 'type AnyFunc<T = any> = (...args: any[]) => T;',
43
- 'type CanExportFunc = AnyFunc<Promise<any>> | AnyFunc<IterableIterator<any>>;',
44
- 'type AutoTypeOfObject<T> = T extends AnyClass ? T : T extends AnyFunc ? ReturnType<T> : T;',
45
- result.content,
46
- ].join('\n');
47
- }
48
-
49
- return result;
50
- }
1
+ 'use strict';
2
+ // const ClassGenerator = require("egg-ts-helper/dist/generators/class").default;
3
+ module.exports = {
4
+ watchDirs: {
5
+ entity: {
6
+ directory: 'app/entity',
7
+ generator: 'object',
8
+ interface: 'IEntity',
9
+ declareTo: 'Application.entity',
10
+ caseStyle: "upper",
11
+ watch: true,
12
+ distName: 'entity.d.ts',
13
+ },
14
+ },
15
+ generatorConfig: {
16
+ entity: {
17
+ directory: 'app/entity',
18
+ generator: 'object',
19
+ interface: 'IEntity',
20
+ declareTo: 'Application.entity',
21
+ caseStyle: "upper",
22
+ watch: true,
23
+ distName: 'entity.d.ts',
24
+ },
25
+ },
26
+ };
27
+
28
+
29
+
30
+ /**
31
+ * 插件提供的接口方式为、1直接提供类，2提供一个函数，函数返回类
32
+ * - 使用这种自定义方式进行类型提取
33
+ */
34
+ function TypeOrmEntityGenerator(config, baseConfig) {
35
+ config.interfaceHandle = config.interfaceHandle || 'AutoTypeOfObject<typeof {{ 0 }}>';
36
+
37
+ const result = ClassGenerator(config, baseConfig);
38
+ /* istanbul ignore else */
39
+ if (result.content) {
40
+ result.content = [
41
+ 'type AnyClass = new (...args: any[]) => any;',
42
+ 'type AnyFunc<T = any> = (...args: any[]) => T;',
43
+ 'type CanExportFunc = AnyFunc<Promise<any>> | AnyFunc<IterableIterator<any>>;',
44
+ 'type AutoTypeOfObject<T> = T extends AnyClass ? T : T extends AnyFunc ? ReturnType<T> : T;',
45
+ result.content,
46
+ ].join('\n');
47
+ }
48
+
49
+ return result;
50
+ }
package/typeorm.d.ts CHANGED
@@ -1,2 +1,4 @@
1
1
  export * from "typeorm";
2
2
  export { EggDataSource } from "./lib/EggDataSource";
3
+ import EggTypeORMLogger from "./lib/Logger";
4
+ export { EggTypeORMLogger };
package/typeorm.js CHANGED
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EggDataSource = void 0;
3
+ exports.EggTypeORMLogger = exports.EggDataSource = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  tslib_1.__exportStar(require("typeorm"), exports);
6
6
  var EggDataSource_1 = require("./lib/EggDataSource");
7
7
  Object.defineProperty(exports, "EggDataSource", { enumerable: true, get: function () { return EggDataSource_1.EggDataSource; } });
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBIn0=
8
+ const Logger_1 = require("./lib/Logger");
9
+ exports.EggTypeORMLogger = Logger_1.default;
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBO0FBQ3RCLHlDQUEyQztBQUNsQywyQkFERixnQkFBZ0IsQ0FDRSJ9