@diyaner/egg-typeorm 2.4.0 → 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.
- package/LICENSE +21 -21
- package/README.md +75 -75
- package/README.zh_CN.md +76 -76
- package/index.d.ts +87 -87
- package/lib/EggDataSource.d.ts +5 -1
- package/lib/EggDataSource.js +41 -1
- package/lib/connection.js +3 -4
- package/package.json +64 -64
- package/tshelper.js +50 -50
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,87 +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
|
-
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;
|
|
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,4 +1,4 @@
|
|
|
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
|
*/
|
|
@@ -44,4 +44,8 @@ export declare class EggDataSource extends DataSource {
|
|
|
44
44
|
* @param isSubfix 是否为后缀
|
|
45
45
|
*/
|
|
46
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;
|
|
47
51
|
}
|
package/lib/EggDataSource.js
CHANGED
|
@@ -186,6 +186,46 @@ class EggDataSource extends typeorm_1.DataSource {
|
|
|
186
186
|
this.eggCustomAddSplitEntityCacheMap.set(name, Classes);
|
|
187
187
|
return Classes;
|
|
188
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
|
+
}
|
|
189
229
|
}
|
|
190
230
|
exports.EggDataSource = EggDataSource;
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
231
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}
|
package/lib/connection.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
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,7 +53,6 @@ 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
57
|
// 留个外部可自定义logger的窗口app.typeorm.Logger
|
|
58
58
|
const Logger = app.typeorm.Logger || Logger_1.default;
|
|
@@ -77,5 +77,4 @@ async function createTypeORMDataSources(app, datasourcesConfig, entities) {
|
|
|
77
77
|
}
|
|
78
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));
|
|
79
79
|
}
|
|
80
|
-
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbm5lY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkJBQTRCO0FBRzVCLHFDQUF3QztBQUN4QyxpQ0FBaUM7QUFDakMsbURBQWdEO0FBQ2hEOzs7R0FHRztBQUNZLEtBQUssb0JBQVcsR0FBd0I7SUFDdEQsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDckMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO0lBRTlDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsNkRBQTZELENBQUMsQ0FBQztJQUU1RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdkIsMEJBQTBCO1FBQzFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDOUIsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMscUJBQXFCO1lBQ3RFLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLDRFQUE2RSxJQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUUzSCxhQUFhLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxzQ0FBc0M7WUFDMUcsNkJBQTZCO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzFELGtCQUFrQjtZQUNsQixJQUFJLEtBQUssS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakIsYUFBYTtnQkFD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
|
|
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.
|
|
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": "^
|
|
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
|
-
}
|
|
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
|
+
}
|