@diyaner/egg-typeorm 2.0.1 → 2.1.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.
- package/LICENSE +21 -21
- package/README.md +75 -75
- package/README.zh_CN.md +76 -76
- package/agent.js +2 -1
- package/app.js +3 -1
- package/config/config.default.js +14 -1
- package/index.d.ts +79 -79
- package/lib/EggDataSource.d.ts +21 -0
- package/lib/EggDataSource.js +70 -0
- package/lib/Logger.js +7 -1
- package/lib/connection.d.ts +6 -2
- package/lib/connection.js +17 -6
- package/lib/loader.js +10 -1
- package/package.json +64 -64
- package/tshelper.js +50 -50
- package/typeorm.d.ts +1 -0
- package/typeorm.js +4 -1
- package/lib/MyDataSource.d.ts +0 -8
- package/lib/MyDataSource.js +0 -51
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/agent.js
CHANGED
|
@@ -7,6 +7,7 @@ const connection_1 = require("./lib/connection");
|
|
|
7
7
|
class EggTypeOrmAppBoot {
|
|
8
8
|
constructor(app) {
|
|
9
9
|
this.app = app;
|
|
10
|
+
// 如果配置未声明typeorm.agent = true 则不能访问
|
|
10
11
|
if (this.app.config.typeorm.agent) {
|
|
11
12
|
this.app.typeorm = {};
|
|
12
13
|
this.app.typeorm.typeORM = typeorm;
|
|
@@ -32,4 +33,4 @@ class EggTypeOrmAppBoot {
|
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
35
|
exports.default = EggTypeOrmAppBoot;
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUMxQixtQ0FBbUM7QUFFbkMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFVO1FBQ3JCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Ysb0NBQW9DO1FBQ3BDLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztZQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztRQUN0RSxDQUFDO0lBQ0YsQ0FBQztJQUNELGFBQWEsS0FBVSxDQUFDO0lBRXhCLEtBQUssQ0FBQyxPQUFPLEtBQUksQ0FBQztJQUVsQixLQUFLLENBQUMsU0FBUztRQUNkLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdCLENBQUM7SUFDRixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbkMsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xELENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBL0JELG9DQStCQyJ9
|
package/app.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
require("reflect-metadata");
|
|
4
4
|
const typeorm = require("typeorm");
|
|
5
|
+
// import * as typeorm from "typeorm"
|
|
5
6
|
const loader_1 = require("./lib/loader");
|
|
6
7
|
const connection_1 = require("./lib/connection");
|
|
7
8
|
class EggTypeOrmAppBoot {
|
|
@@ -15,6 +16,7 @@ class EggTypeOrmAppBoot {
|
|
|
15
16
|
}
|
|
16
17
|
configDidLoad() { }
|
|
17
18
|
async didLoad() { }
|
|
19
|
+
/** 在willReady时启动数据库，则didLoad中可以异步拉取数据库配置从配置中心 */
|
|
18
20
|
async willReady() {
|
|
19
21
|
(0, loader_1.default)(this.app);
|
|
20
22
|
await (0, connection_1.default)(this.app);
|
|
@@ -26,4 +28,4 @@ class EggTypeOrmAppBoot {
|
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
30
|
exports.default = EggTypeOrmAppBoot;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLG1DQUFtQztBQUVuQyxxQ0FBcUM7QUFDckMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFnQjtRQUMzQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUVmLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztRQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7UUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztJQUN0RSxDQUFDO0lBQ0QsYUFBYSxLQUFVLENBQUM7SUFFeEIsS0FBSyxDQUFDLE9BQU8sS0FBSSxDQUFDO0lBRWxCLGlEQUFpRDtJQUNqRCxLQUFLLENBQUMsU0FBUztRQUNkLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNoQixLQUFLLE1BQU0sRUFBRSxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztZQUM1RCxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNsRCxDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBMUJELG9DQTBCQyJ9
|
package/config/config.default.js
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* @copyright: Huang Ding
|
|
3
|
+
* @Author: ding-cx
|
|
4
|
+
* @Date: 2021-02-21 13:43:29
|
|
5
|
+
* @LastEditors: ding-cx
|
|
6
|
+
* @LastEditTime: 2021-02-21 17:55:47
|
|
7
|
+
* @Description: file content
|
|
8
|
+
*/
|
|
1
9
|
"use strict";
|
|
2
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
+
/**
|
|
12
|
+
* egg-typeorm default config
|
|
13
|
+
* @member Config#typeorm
|
|
14
|
+
* @property {String} SOME_KEY - some description
|
|
15
|
+
*/
|
|
3
16
|
exports.default = () => {
|
|
4
17
|
const config = {};
|
|
5
18
|
config.typeorm = {
|
|
@@ -7,4 +20,4 @@ exports.default = () => {
|
|
|
7
20
|
};
|
|
8
21
|
return config;
|
|
9
22
|
};
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb25maWcuZGVmYXVsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztHQU9HO0FBQ0gsWUFBWSxDQUFDOztBQUliOzs7O0dBSUc7QUFFSCxrQkFBZSxHQUFHLEVBQUU7SUFDbkIsTUFBTSxNQUFNLEdBQUcsRUFBZ0MsQ0FBQztJQUNoRCxNQUFNLENBQUMsT0FBTyxHQUFHO1FBQ2hCLEtBQUssRUFBRSxLQUFLO0tBQ1osQ0FBQztJQUNGLE9BQU8sTUFBTSxDQUFDO0FBQ2YsQ0FBQyxDQUFDIn0=
|
package/index.d.ts
CHANGED
|
@@ -1,79 +1,79 @@
|
|
|
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 {
|
|
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]:
|
|
40
|
-
};
|
|
41
|
-
/** 绑定实体类列表 */
|
|
42
|
-
entites: {
|
|
43
|
-
all: any[];
|
|
44
|
-
// 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
|
|
45
|
-
level1: any[];
|
|
46
|
-
// 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
|
|
47
|
-
dirs: {
|
|
48
|
-
[key: string]: any[];
|
|
49
|
-
};
|
|
50
|
-
};
|
|
51
|
-
/** 挂载app上，可动态创建typeORM实例 */
|
|
52
|
-
createTypeORMDataSources: createTypeORMDataSources;
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
interface Agent {
|
|
57
|
-
/** 绑定所有typeorm的导出，并添加连接实例map */
|
|
58
|
-
typeorm: {
|
|
59
|
-
typeORM: typeof typeorm;
|
|
60
|
-
/** 数据库连接实例 其key为配置时的name属性 */
|
|
61
|
-
datasources: {
|
|
62
|
-
[key: string]:
|
|
63
|
-
};
|
|
64
|
-
/** 绑定实体类列表 */
|
|
65
|
-
entites: {
|
|
66
|
-
all: any[];
|
|
67
|
-
// 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
|
|
68
|
-
level1: any[];
|
|
69
|
-
// 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
|
|
70
|
-
dirs: {
|
|
71
|
-
[key: string]: any[];
|
|
72
|
-
};
|
|
73
|
-
};
|
|
74
|
-
/** 挂载app上，可动态创建typeORM实例 */
|
|
75
|
-
createTypeORMDataSources: createTypeORMDataSources;
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
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
|
+
level1: any[];
|
|
46
|
+
// 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
|
|
47
|
+
dirs: {
|
|
48
|
+
[key: string]: any[];
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
/** 挂载app上，可动态创建typeORM实例 */
|
|
52
|
+
createTypeORMDataSources: typeof createTypeORMDataSources;
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
interface Agent {
|
|
57
|
+
/** 绑定所有typeorm的导出，并添加连接实例map */
|
|
58
|
+
typeorm: {
|
|
59
|
+
typeORM: typeof typeorm;
|
|
60
|
+
/** 数据库连接实例 其key为配置时的name属性 */
|
|
61
|
+
datasources: {
|
|
62
|
+
[key: string]: EggDataSource;
|
|
63
|
+
};
|
|
64
|
+
/** 绑定实体类列表 */
|
|
65
|
+
entites: {
|
|
66
|
+
all: any[];
|
|
67
|
+
// 第一层中直接定义的实体，直接附加给第一个连接。（因为把第一个连接作为默认主连接数据库）
|
|
68
|
+
level1: any[];
|
|
69
|
+
// 按第一层文件夹区分的实体，是要对应到数据库连接name属性的。也就是不同name对应不同实体目录
|
|
70
|
+
dirs: {
|
|
71
|
+
[key: string]: any[];
|
|
72
|
+
};
|
|
73
|
+
};
|
|
74
|
+
/** 挂载app上，可动态创建typeORM实例 */
|
|
75
|
+
createTypeORMDataSources: typeof createTypeORMDataSources;
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
export = Egg;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { DataSource, QueryRunner } from "typeorm";
|
|
2
|
+
/**
|
|
3
|
+
* custom extend typeorm's DataSource class
|
|
4
|
+
*/
|
|
5
|
+
export declare class EggDataSource extends DataSource {
|
|
6
|
+
private customAddEntityCacheMap;
|
|
7
|
+
/**
|
|
8
|
+
* 在一个typeorm连接datasource实例上动态添加一个实体及其metadata
|
|
9
|
+
*
|
|
10
|
+
* - 可以实现动态分表
|
|
11
|
+
*
|
|
12
|
+
* - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
|
|
13
|
+
*/
|
|
14
|
+
addEntity<T extends Function>(clz: T): Promise<this>;
|
|
15
|
+
/** 一个实体类来构建元数据 */
|
|
16
|
+
private buildMetaData2;
|
|
17
|
+
/** 移除一个ds上的某个类实体 */
|
|
18
|
+
removeEntity<T extends Function>(clz: T): void;
|
|
19
|
+
/** query方法，支持查询语句转义 :params */
|
|
20
|
+
query2<T = any>(query: string, parameters: Record<string, any>, queryRunner?: QueryRunner): Promise<T>;
|
|
21
|
+
}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EggDataSource = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const ConnectionMetadataBuilder_1 = require("typeorm/connection/ConnectionMetadataBuilder");
|
|
6
|
+
const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetadataValidator");
|
|
7
|
+
// import { ObjectUtils } from "typeorm/util/ObjectUtils";
|
|
8
|
+
/**
|
|
9
|
+
* custom extend typeorm's DataSource class
|
|
10
|
+
*/
|
|
11
|
+
class EggDataSource extends typeorm_1.DataSource {
|
|
12
|
+
constructor() {
|
|
13
|
+
super(...arguments);
|
|
14
|
+
this.customAddEntityCacheMap = new Map();
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* 在一个typeorm连接datasource实例上动态添加一个实体及其metadata
|
|
18
|
+
*
|
|
19
|
+
* - 可以实现动态分表
|
|
20
|
+
*
|
|
21
|
+
* - 注意：不能在每个请求之中重复添加相同功能的类，否则可能造成OOM；应该在app全局上统一获取单例类
|
|
22
|
+
*/
|
|
23
|
+
async addEntity(clz) {
|
|
24
|
+
const entityCacheClz = this.customAddEntityCacheMap.get(clz);
|
|
25
|
+
if (entityCacheClz) {
|
|
26
|
+
return this;
|
|
27
|
+
}
|
|
28
|
+
await this.buildMetaData2(clz);
|
|
29
|
+
this.customAddEntityCacheMap.set(clz, true);
|
|
30
|
+
return this;
|
|
31
|
+
}
|
|
32
|
+
/** 一个实体类来构建元数据 */
|
|
33
|
+
async buildMetaData2(entity) {
|
|
34
|
+
const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
|
|
35
|
+
const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
|
|
36
|
+
// build entity metadatas
|
|
37
|
+
const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas([entity]);
|
|
38
|
+
for (const metadata of entityMetadatas) {
|
|
39
|
+
this.entityMetadatas.push(metadata);
|
|
40
|
+
this.entityMetadatasMap.set(metadata.target, metadata);
|
|
41
|
+
}
|
|
42
|
+
// validate all created entity metadatas to make sure user created entities are valid and correct
|
|
43
|
+
entityMetadataValidator.validateMany(entityMetadatas, this.driver);
|
|
44
|
+
// set current data source to the entities
|
|
45
|
+
for (let entityMetadata of entityMetadatas) {
|
|
46
|
+
if (typeorm_1.InstanceChecker.isBaseEntityConstructor(entityMetadata.target)) {
|
|
47
|
+
entityMetadata.target.useDataSource(this);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
/** 移除一个ds上的某个类实体 */
|
|
52
|
+
removeEntity(clz) {
|
|
53
|
+
this.customAddEntityCacheMap.delete(clz);
|
|
54
|
+
const metadata = this.entityMetadatasMap.get(clz);
|
|
55
|
+
if (metadata && typeorm_1.InstanceChecker.isBaseEntityConstructor(metadata.target)) {
|
|
56
|
+
// @ts-ignore
|
|
57
|
+
metadata.target.dataSource = null;
|
|
58
|
+
}
|
|
59
|
+
// @ts-ignore
|
|
60
|
+
this.entityMetadatas = this.entityMetadatas.filter((item) => item.target !== clz);
|
|
61
|
+
this.entityMetadatasMap.delete(clz);
|
|
62
|
+
}
|
|
63
|
+
/** query方法，支持查询语句转义 :params */
|
|
64
|
+
async query2(query, parameters, queryRunner) {
|
|
65
|
+
const result = this.driver.escapeQueryWithParameters(query, parameters, {});
|
|
66
|
+
return await super.query(result[0], result[1], queryRunner);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
exports.EggDataSource = EggDataSource;
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUNBQW1FO0FBQ25FLDRGQUF5RjtBQUN6Riw4RkFBMkY7QUFDM0YsMERBQTBEO0FBRTFEOztHQUVHO0FBQ0gsTUFBYSxhQUFjLFNBQVEsb0JBQVU7SUFBN0M7O1FBQ1MsNEJBQXVCLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7SUE2RDdELENBQUM7SUEzREE7Ozs7OztPQU1HO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBcUIsR0FBTTtRQUN6QyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsdUJBQXVCLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdELElBQUksY0FBYyxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDYixDQUFDO1FBRUQsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVDLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUVELGtCQUFrQjtJQUNWLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBZ0I7UUFDNUMsTUFBTSx5QkFBeUIsR0FBRyxJQUFJLHFEQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRTlELHlCQUF5QjtRQUN6QixNQUFNLGVBQWUsR0FBRyxNQUFNLHlCQUF5QixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUN2RixLQUFLLE1BQU0sUUFBUSxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQ3hDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN4RCxDQUFDO1FBRUQsaUdBQWlHO1FBQ2pHLHVCQUF1QixDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRW5FLDBDQUEwQztRQUMxQyxLQUFLLElBQUksY0FBYyxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQzVDLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztnQkFDcEUsY0FBYyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDM0MsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0lBRUQsb0JBQW9CO0lBQ3BCLFlBQVksQ0FBcUIsR0FBTTtRQUN0QyxJQUFJLENBQUMsdUJBQXVCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEQsSUFBSSxRQUFRLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztZQUMxRSxhQUFhO1lBQ2IsUUFBUSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ25DLENBQUM7UUFDRCxhQUFhO1FBQ2IsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQztRQUNsRixJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCwrQkFBK0I7SUFDL0IsS0FBSyxDQUFDLE1BQU0sQ0FBVSxLQUFhLEVBQUUsVUFBK0IsRUFBRSxXQUF5QjtRQUM5RixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLHlCQUF5QixDQUFDLEtBQUssRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDNUUsT0FBTyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUM3RCxDQUFDO0NBQ0Q7QUE5REQsc0NBOERDIn0=
|
package/lib/Logger.js
CHANGED
|
@@ -18,13 +18,19 @@ class EggTypeORMLogger {
|
|
|
18
18
|
logQuerySlow(time, query, parameters, _queryRunner) {
|
|
19
19
|
this.app.coreLogger.warn(`[egg-typeorm Logger slow sql] %s \r\n%s \r\n%j`, time, query, parameters);
|
|
20
20
|
}
|
|
21
|
+
// @ts-ignore
|
|
21
22
|
logSchemaBuild(message, queryRunner) {
|
|
23
|
+
// throw new Error("Method not implemented.");
|
|
22
24
|
}
|
|
25
|
+
// @ts-ignore
|
|
23
26
|
logMigration(message, queryRunner) {
|
|
27
|
+
// throw new Error("Method not implemented.");
|
|
24
28
|
}
|
|
29
|
+
// @ts-ignore
|
|
25
30
|
log(level, message, queryRunner) {
|
|
31
|
+
// throw new Error("Method not implemented.");
|
|
26
32
|
this.app.logger[this.loggerMap[level]](message);
|
|
27
33
|
}
|
|
28
34
|
}
|
|
29
35
|
exports.default = EggTypeORMLogger;
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBcUIsZ0JBQWdCO0lBQ3BDLFlBQW9CLEdBQXdCO1FBQXhCLFFBQUcsR0FBSCxHQUFHLENBQXFCO1FBb0I1QyxjQUFTLEdBQUc7WUFDWCxHQUFHLEVBQUUsTUFBTTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osSUFBSSxFQUFFLE1BQU07U0FDWixDQUFDO0lBeEI2QyxDQUFDO0lBQ2hELFFBQVEsQ0FBQyxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUM3RixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0NBQWdDLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2hGLENBQUM7SUFDRCxhQUFhLENBQUMsS0FBcUIsRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUN6SCxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBQ0QsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsVUFBOEIsRUFBRSxZQUFzQztRQUMvRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0RBQWdELEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNyRyxDQUFDO0lBRUQsYUFBYTtJQUNiLGNBQWMsQ0FBQyxPQUFlLEVBQUUsV0FBcUM7UUFDcEUsOENBQThDO0lBQy9DLENBQUM7SUFDRCxhQUFhO0lBQ2IsWUFBWSxDQUFDLE9BQWUsRUFBRSxXQUFxQztRQUNsRSw4Q0FBOEM7SUFDL0MsQ0FBQztJQVFELGFBQWE7SUFDYixHQUFHLENBQUMsS0FBOEIsRUFBRSxPQUFZLEVBQUUsV0FBcUM7UUFDdEYsOENBQThDO1FBQzlDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNqRCxDQUFDO0NBQ0Q7QUFoQ0QsbUNBZ0NDIn0=
|
package/lib/connection.d.ts
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { Application, Agent, EggConfigTypeormDataSourceOptions } from "egg";
|
|
2
|
-
import {
|
|
2
|
+
import { EggDataSource } from "./EggDataSource";
|
|
3
|
+
/**
|
|
4
|
+
* 初始化typeorm插件
|
|
5
|
+
* - 根据config提供的配置初始化连接，data sources 实例将会绑定在app上
|
|
6
|
+
*/
|
|
3
7
|
export default function (app: Application | Agent): Promise<void>;
|
|
4
8
|
export declare function createTypeORMDataSources(app: Application | Agent, datasourcesConfig: EggConfigTypeormDataSourceOptions, entities?: any[]): Promise<{
|
|
5
9
|
config: EggConfigTypeormDataSourceOptions;
|
|
6
|
-
dataSource:
|
|
10
|
+
dataSource: EggDataSource;
|
|
7
11
|
}>;
|
package/lib/connection.js
CHANGED
|
@@ -1,25 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createTypeORMDataSources = void 0;
|
|
4
|
+
const util = require("util");
|
|
4
5
|
const Logger_1 = require("./Logger");
|
|
5
6
|
const assert = require("assert");
|
|
6
|
-
const
|
|
7
|
+
const EggDataSource_1 = require("./EggDataSource");
|
|
8
|
+
/**
|
|
9
|
+
* 初始化typeorm插件
|
|
10
|
+
* - 根据config提供的配置初始化连接，data sources 实例将会绑定在app上
|
|
11
|
+
*/
|
|
7
12
|
async function default_1(app) {
|
|
8
13
|
const entities = app.typeorm.entites;
|
|
9
14
|
const config = app.config.typeorm.datasources;
|
|
10
15
|
assert.ok(config.length > 0, `typeorm plugin need you provide database connection params.`);
|
|
11
16
|
if (config.length > 1) {
|
|
17
|
+
// console.log("多个数据库配置");
|
|
12
18
|
config.forEach((item, index) => {
|
|
13
|
-
let entityDirName = item.entityDir || item.name;
|
|
19
|
+
let entityDirName = item.entityDir || item.name; // 取配置中的实体目录属性或name属性
|
|
14
20
|
assert.ok(entityDirName, `Error, connection need a unique entityDir or name for relate entity dir. ${item.host}`);
|
|
15
|
-
entityDirName = entityDirName.replace(/[._-]/gi, "").toUpperCase();
|
|
21
|
+
entityDirName = entityDirName.replace(/[._-]/gi, "").toUpperCase(); // 此处是为与loader中的目录名对应。（其目录名有转换，不实等真实名）
|
|
22
|
+
// @ts-ignore 每个连接只使用自己的子目录实体
|
|
16
23
|
item.entities = [...(entities.dirs[entityDirName] || [])];
|
|
24
|
+
// 第一个连接还需要加上首层的实体
|
|
17
25
|
if (index === 0) {
|
|
26
|
+
// @ts-ignore
|
|
18
27
|
item.entities = [...(entities.level1 || []), ...item.entities];
|
|
19
28
|
}
|
|
20
29
|
});
|
|
21
30
|
}
|
|
22
31
|
else {
|
|
32
|
+
// 如果只有一个连接，则默认使用所有的实体
|
|
23
33
|
config[0].entities = [...(entities.all || [])];
|
|
24
34
|
}
|
|
25
35
|
const names = [];
|
|
@@ -44,13 +54,14 @@ async function default_1(app) {
|
|
|
44
54
|
}
|
|
45
55
|
exports.default = default_1;
|
|
46
56
|
async function createTypeORMDataSources(app, datasourcesConfig, entities) {
|
|
57
|
+
// set logger if user do not provide
|
|
47
58
|
if (datasourcesConfig.logger === undefined) {
|
|
48
59
|
datasourcesConfig.logger = new Logger_1.default(app);
|
|
49
60
|
}
|
|
50
61
|
if (entities) {
|
|
51
62
|
datasourcesConfig.entities = entities;
|
|
52
63
|
}
|
|
53
|
-
const ds = new
|
|
64
|
+
const ds = new EggDataSource_1.EggDataSource(datasourcesConfig);
|
|
54
65
|
for (let i = 0; i < 3; i++) {
|
|
55
66
|
try {
|
|
56
67
|
await ds.initialize();
|
|
@@ -62,7 +73,7 @@ async function createTypeORMDataSources(app, datasourcesConfig, entities) {
|
|
|
62
73
|
await new Promise((resolve) => setTimeout(resolve, 1200));
|
|
63
74
|
}
|
|
64
75
|
}
|
|
65
|
-
throw new Error(`the DB init connection was failed after retry 3 times
|
|
76
|
+
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));
|
|
66
77
|
}
|
|
67
78
|
exports.createTypeORMDataSources = createTypeORMDataSources;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakIsYUFBYTtnQkFD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
|
package/lib/loader.js
CHANGED
|
@@ -11,14 +11,23 @@ exports.default = async (app) => {
|
|
|
11
11
|
const entitys = app.typeorm.entites;
|
|
12
12
|
app.loader.loadToApp(dir, "entity", {
|
|
13
13
|
caseStyle: "upper",
|
|
14
|
+
// 要求加载的全部都是default export 类/函数
|
|
14
15
|
initializer(Clz, opt) {
|
|
16
|
+
// @ts-ignore
|
|
15
17
|
Clz.app = app;
|
|
18
|
+
// console.log(Clz);
|
|
19
|
+
// console.log(opt);
|
|
20
|
+
// const className = Object.keys(Clz)[0];
|
|
16
21
|
const properties = opt.pathName.split(".");
|
|
22
|
+
// console.log(properties);
|
|
17
23
|
entitys.all.push(Clz);
|
|
24
|
+
// 类定义在第一层
|
|
18
25
|
if (properties.length === 2) {
|
|
19
26
|
entitys.level1.push(Clz);
|
|
20
27
|
}
|
|
21
28
|
else if (properties.length > 2) {
|
|
29
|
+
// 类定义在子目录下，
|
|
30
|
+
// 注意这里名称可能不是目录名（因有caseStyle转换），所以统一转为大写
|
|
22
31
|
const dirName = properties[1].toUpperCase();
|
|
23
32
|
entitys.dirs[dirName] = entitys.dirs[dirName] || [];
|
|
24
33
|
entitys.dirs[dirName].push(Clz);
|
|
@@ -27,4 +36,4 @@ exports.default = async (app) => {
|
|
|
27
36
|
},
|
|
28
37
|
});
|
|
29
38
|
};
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNkJBQTZCO0FBRTdCLGtCQUFlLEtBQUssRUFBRSxHQUF3QixFQUFFLEVBQUU7SUFDakQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN4RCxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSTtRQUM1QyxJQUFJLEVBQUUsRUFBRTtRQUNSLEdBQUcsRUFBRSxFQUFFO1FBQ1AsTUFBTSxFQUFFLEVBQUU7S0FDVixDQUFDO0lBQ0YsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFFcEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtRQUNuQyxTQUFTLEVBQUUsT0FBTztRQUNsQiwrQkFBK0I7UUFDL0IsV0FBVyxDQUFDLEdBQUcsRUFBRSxHQUFHO1lBQ25CLGFBQWE7WUFDYixHQUFHLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztZQUNkLG9CQUFvQjtZQUNwQixvQkFBb0I7WUFDcEIseUNBQXlDO1lBQ3pDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQzNDLDJCQUEyQjtZQUUzQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN0QixVQUFVO1lBQ1YsSUFBSSxVQUFVLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO2dCQUM3QixPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUMxQixDQUFDO2lCQUFNLElBQUksVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDbEMsWUFBWTtnQkFDWix3Q0FBd0M7Z0JBQ3hDLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDNUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDcEQsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakMsQ0FBQztZQUVELE9BQU8sR0FBRyxDQUFDO1FBQ1osQ0FBQztLQUNELENBQUMsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,64 +1,64 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "@diyaner/egg-typeorm",
|
|
3
|
-
"version": "2.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.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.
|
|
24
|
-
"egg-bin": "^6.
|
|
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.
|
|
30
|
-
"typescript": "^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.1.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.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
|
+
}
|
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
package/typeorm.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EggDataSource = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
tslib_1.__exportStar(require("typeorm"), exports);
|
|
5
|
-
|
|
6
|
+
var EggDataSource_1 = require("./lib/EggDataSource");
|
|
7
|
+
Object.defineProperty(exports, "EggDataSource", { enumerable: true, get: function () { return EggDataSource_1.EggDataSource; } });
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBIn0=
|
package/lib/MyDataSource.d.ts
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { DataSource, QueryRunner } from "typeorm";
|
|
2
|
-
export declare class MyDataSource extends DataSource {
|
|
3
|
-
private customAddEntityCacheMap;
|
|
4
|
-
addEntity<T extends Function>(clz: T): Promise<this>;
|
|
5
|
-
private buildMetaData2;
|
|
6
|
-
removeEntity<T extends Function>(clz: T): void;
|
|
7
|
-
query2<T = any>(query: string, parameters: Record<string, any>, queryRunner?: QueryRunner): Promise<T>;
|
|
8
|
-
}
|
package/lib/MyDataSource.js
DELETED
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MyDataSource = void 0;
|
|
4
|
-
const typeorm_1 = require("typeorm");
|
|
5
|
-
const ConnectionMetadataBuilder_1 = require("typeorm/connection/ConnectionMetadataBuilder");
|
|
6
|
-
const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetadataValidator");
|
|
7
|
-
class MyDataSource extends typeorm_1.DataSource {
|
|
8
|
-
constructor() {
|
|
9
|
-
super(...arguments);
|
|
10
|
-
this.customAddEntityCacheMap = new Map();
|
|
11
|
-
}
|
|
12
|
-
async addEntity(clz) {
|
|
13
|
-
const entityCacheClz = this.customAddEntityCacheMap.get(clz);
|
|
14
|
-
if (entityCacheClz) {
|
|
15
|
-
return this;
|
|
16
|
-
}
|
|
17
|
-
await this.buildMetaData2(clz);
|
|
18
|
-
this.customAddEntityCacheMap.set(clz, true);
|
|
19
|
-
return this;
|
|
20
|
-
}
|
|
21
|
-
async buildMetaData2(entity) {
|
|
22
|
-
const connectionMetadataBuilder = new ConnectionMetadataBuilder_1.ConnectionMetadataBuilder(this);
|
|
23
|
-
const entityMetadataValidator = new EntityMetadataValidator_1.EntityMetadataValidator();
|
|
24
|
-
const entityMetadatas = await connectionMetadataBuilder.buildEntityMetadatas([entity]);
|
|
25
|
-
for (const metadata of entityMetadatas) {
|
|
26
|
-
this.entityMetadatas.push(metadata);
|
|
27
|
-
this.entityMetadatasMap.set(metadata.target, metadata);
|
|
28
|
-
}
|
|
29
|
-
entityMetadataValidator.validateMany(entityMetadatas, this.driver);
|
|
30
|
-
for (let entityMetadata of entityMetadatas) {
|
|
31
|
-
if (typeorm_1.InstanceChecker.isBaseEntityConstructor(entityMetadata.target)) {
|
|
32
|
-
entityMetadata.target.useDataSource(this);
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
removeEntity(clz) {
|
|
37
|
-
this.customAddEntityCacheMap.delete(clz);
|
|
38
|
-
const metadata = this.entityMetadatasMap.get(clz);
|
|
39
|
-
if (metadata && typeorm_1.InstanceChecker.isBaseEntityConstructor(metadata.target)) {
|
|
40
|
-
metadata.target.dataSource = null;
|
|
41
|
-
}
|
|
42
|
-
this.entityMetadatas = this.entityMetadatas.filter((item) => item.target !== clz);
|
|
43
|
-
this.entityMetadatasMap.delete(clz);
|
|
44
|
-
}
|
|
45
|
-
async query2(query, parameters, queryRunner) {
|
|
46
|
-
const result = this.driver.escapeQueryWithParameters(query, parameters, {});
|
|
47
|
-
return await super.query(result[0], result[1], queryRunner);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
exports.MyDataSource = MyDataSource;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlEYXRhU291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTXlEYXRhU291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUFtRTtBQUNuRSw0RkFBeUY7QUFDekYsOEZBQTJGO0FBTTNGLE1BQWEsWUFBYSxTQUFRLG9CQUFVO0lBQTVDOztRQUNTLDRCQUF1QixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO0lBNkQ3RCxDQUFDO0lBcERBLEtBQUssQ0FBQyxTQUFTLENBQXFCLEdBQU07UUFDekMsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3RCxJQUFJLGNBQWMsRUFBRTtZQUNuQixPQUFPLElBQUksQ0FBQztTQUNaO1FBRUQsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVDLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUdPLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBZ0I7UUFDNUMsTUFBTSx5QkFBeUIsR0FBRyxJQUFJLHFEQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRzlELE1BQU0sZUFBZSxHQUFHLE1BQU0seUJBQXlCLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3ZGLEtBQUssTUFBTSxRQUFRLElBQUksZUFBZSxFQUFFO1lBQ3ZDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztTQUN2RDtRQUdELHVCQUF1QixDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBR25FLEtBQUssSUFBSSxjQUFjLElBQUksZUFBZSxFQUFFO1lBQzNDLElBQUkseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEVBQUU7Z0JBQ25FLGNBQWMsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQzFDO1NBQ0Q7SUFDRixDQUFDO0lBR0QsWUFBWSxDQUFxQixHQUFNO1FBQ3RDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNsRCxJQUFJLFFBQVEsSUFBSSx5QkFBZSxDQUFDLHVCQUF1QixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUV6RSxRQUFRLENBQUMsTUFBTSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUM7U0FDbEM7UUFFRCxJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQyxDQUFDO1FBQ2xGLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUdELEtBQUssQ0FBQyxNQUFNLENBQVUsS0FBYSxFQUFFLFVBQStCLEVBQUUsV0FBeUI7UUFDOUYsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLLEVBQUUsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQzVFLE9BQU8sTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDN0QsQ0FBQztDQUNEO0FBOURELG9DQThEQyJ9
|