@diyaner/egg-typeorm 2.6.3 → 3.0.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 (11) hide show
  1. package/README.md +3 -1
  2. package/agent.js +2 -2
  3. package/app.js +2 -3
  4. package/index.d.ts +1 -1
  5. package/lib/EggDataSource.d.ts +1 -1
  6. package/lib/EggDataSource.js +47 -25
  7. package/lib/Logger.d.ts +1 -1
  8. package/lib/connection.js +3 -4
  9. package/package.json +3 -3
  10. package/typeorm.d.ts +1 -1
  11. package/typeorm.js +2 -2
package/README.md CHANGED
@@ -1,4 +1,6 @@
1
- # egg-ts-template
1
+ # egg-typeorm
2
+
3
+ ## 3.0 版本采用@ginreo/typeorm 替换typeorm，作为发布线
2
4
 
3
5
  [![NPM version][npm-image]][npm-url]
4
6
  [![build status][travis-image]][travis-url]
package/agent.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  require("reflect-metadata");
4
- const typeorm = require("typeorm");
4
+ const typeorm = require("@ginreo/typeorm");
5
5
  const loader_1 = require("./lib/loader");
6
6
  const connection_1 = require("./lib/connection");
7
7
  class EggTypeOrmAppBoot {
@@ -33,4 +33,4 @@ class EggTypeOrmAppBoot {
33
33
  }
34
34
  }
35
35
  exports.default = EggTypeOrmAppBoot;
36
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUMxQixtQ0FBbUM7QUFFbkMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFVO1FBQ3JCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Ysb0NBQW9DO1FBQ3BDLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztZQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztRQUN0RSxDQUFDO0lBQ0YsQ0FBQztJQUNELGFBQWEsS0FBVSxDQUFDO0lBRXhCLEtBQUssQ0FBQyxPQUFPLEtBQUksQ0FBQztJQUVsQixLQUFLLENBQUMsU0FBUztRQUNkLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdCLENBQUM7SUFDRixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbkMsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xELENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBL0JELG9DQStCQyJ9
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDRCQUEwQjtBQUMxQiwyQ0FBMkM7QUFFM0MseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFVO1FBQ3JCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Ysb0NBQW9DO1FBQ3BDLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztZQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztRQUN0RSxDQUFDO0lBQ0YsQ0FBQztJQUNELGFBQWEsS0FBVSxDQUFDO0lBRXhCLEtBQUssQ0FBQyxPQUFPLEtBQUksQ0FBQztJQUVsQixLQUFLLENBQUMsU0FBUztRQUNkLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25DLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdCLENBQUM7SUFDRixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDaEIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbkMsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xELENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBL0JELG9DQStCQyJ9
package/app.js CHANGED
@@ -1,8 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  require("reflect-metadata");
4
- const typeorm = require("typeorm");
5
- // import * as typeorm from "typeorm"
4
+ const typeorm = require("@ginreo/typeorm");
6
5
  const loader_1 = require("./lib/loader");
7
6
  const connection_1 = require("./lib/connection");
8
7
  class EggTypeOrmAppBoot {
@@ -28,4 +27,4 @@ class EggTypeOrmAppBoot {
28
27
  }
29
28
  }
30
29
  exports.default = EggTypeOrmAppBoot;
31
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLG1DQUFtQztBQUVuQyxxQ0FBcUM7QUFDckMseUNBQXNDO0FBQ3RDLGlEQUF5RTtBQUV6RSxNQUFxQixpQkFBaUI7SUFFckMsWUFBWSxHQUFnQjtRQUMzQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUVmLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxHQUFHLEVBQVMsQ0FBQztRQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7UUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsR0FBRyxxQ0FBd0IsQ0FBQztJQUN0RSxDQUFDO0lBQ0QsYUFBYSxLQUFVLENBQUM7SUFFeEIsS0FBSyxDQUFDLE9BQU8sS0FBSSxDQUFDO0lBRWxCLGlEQUFpRDtJQUNqRCxLQUFLLENBQUMsU0FBUztRQUNkLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsTUFBTSxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNoQixLQUFLLE1BQU0sRUFBRSxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztZQUM1RCxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNsRCxDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBMUJELG9DQTBCQyJ9
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTBCO0FBRTFCLDJDQUEyQztBQUUzQyx5Q0FBc0M7QUFDdEMsaURBQXlFO0FBRXpFLE1BQXFCLGlCQUFpQjtJQUVyQyxZQUFZLEdBQWdCO1FBQzNCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBRWYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEdBQUcsRUFBUyxDQUFDO1FBQzdCLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDbkMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxHQUFHLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQzdELElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLHdCQUF3QixHQUFHLHFDQUF3QixDQUFDO0lBQ3RFLENBQUM7SUFDRCxhQUFhLEtBQVUsQ0FBQztJQUV4QixLQUFLLENBQUMsT0FBTyxLQUFJLENBQUM7SUFFbEIsaURBQWlEO0lBQ2pELEtBQUssQ0FBQyxTQUFTO1FBQ2QsSUFBQSxnQkFBVSxFQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixNQUFNLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXO1FBQ2hCLEtBQUssTUFBTSxFQUFFLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQzVELE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xELENBQUM7SUFDRixDQUFDO0NBQ0Q7QUExQkQsb0NBMEJDIn0=
package/index.d.ts CHANGED
@@ -8,7 +8,7 @@
8
8
  */
9
9
 
10
10
  import Egg from "egg";
11
- import * as typeorm from "typeorm";
11
+ import * as typeorm from "@ginreo/typeorm";
12
12
  import { createTypeORMDataSources } from "./lib/connection";
13
13
  import { EggDataSource } from "./lib/EggDataSource";
14
14
 
package/lib/EggDataSource.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { DataSource, EntityTarget, ObjectLiteral, QueryRunner } from "typeorm";
1
+ import { DataSource, EntityTarget, ObjectLiteral, QueryRunner } from "@ginreo/typeorm";
2
2
  /**
3
3
  * custom extend typeorm's DataSource class
4
4
  */
package/lib/EggDataSource.js CHANGED
@@ -2,10 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EggDataSource = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const typeorm_1 = require("typeorm");
6
- const ConnectionMetadataBuilder_1 = require("typeorm/connection/ConnectionMetadataBuilder");
7
- const EntityMetadataValidator_1 = require("typeorm/metadata-builder/EntityMetadataValidator");
8
- // import { ObjectUtils } from "typeorm/util/ObjectUtils";
5
+ const typeorm_1 = require("@ginreo/typeorm");
6
+ const ConnectionMetadataBuilder_1 = require("@ginreo/typeorm/connection/ConnectionMetadataBuilder");
7
+ const EntityMetadataValidator_1 = require("@ginreo/typeorm/metadata-builder/EntityMetadataValidator");
8
+ // import { ObjectUtils } from "@ginreo/typeorm/util/ObjectUtils";
9
9
  /**
10
10
  * custom extend typeorm's DataSource class
11
11
  */
@@ -190,7 +190,7 @@ class EggDataSource extends typeorm_1.DataSource {
190
190
  * - 解决typeorm内部未处理Date, Json等类型的问题
191
191
  */
192
192
  createEntityInstance(EntityClass, plainObject) {
193
- var _a, _b;
193
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
194
194
  // const instance = this.manager.create(entityClass, plainObject);
195
195
  const instance = new EntityClass();
196
196
  const metadata = this.getMetadata(EntityClass);
@@ -262,25 +262,33 @@ class EggDataSource extends typeorm_1.DataSource {
262
262
  }
263
263
  instance[column.propertyName] = value;
264
264
  }
265
- else if (column.relationMetadata) {
266
- const relationMetadata = column.relationMetadata;
267
- // console.log(column.relationMetadata.propertyName);
268
- // console.log(column.relationMetadata.relationType);
269
- const value = plainObject[relationMetadata.propertyName];
270
- if (!value)
271
- continue;
272
- const relationType = relationMetadata.relationType;
273
- if (relationType === "one-to-one" || relationType === "many-to-one") {
274
- // @ts-ignore
275
- instance[relationMetadata.propertyName] = this.createEntityInstance(relationMetadata.type, value);
276
- }
277
- else if (relationType === "one-to-many" || relationType === "many-to-many") {
278
- // @ts-ignore
279
- instance[relationMetadata.propertyName] = value === null || value === void 0 ? void 0 : value.map((item) => {
280
- return this.createEntityInstance(relationMetadata.type, item);
281
- });
265
+ else if (column.type === "string" ||
266
+ column.type === "date" ||
267
+ column.type === String ||
268
+ ((_b = (_a = column.type) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.includes("char")) ||
269
+ ((_d = (_c = column.type) === null || _c === void 0 ? void 0 : _c.toString()) === null || _d === void 0 ? void 0 : _d.includes("text")) ||
270
+ ((_f = (_e = column.type) === null || _e === void 0 ? void 0 : _e.toString()) === null || _f === void 0 ? void 0 : _f.includes("varchar"))) {
271
+ if (plainObject[column.propertyName] !== undefined) {
272
+ instance[column.propertyName] = plainObject[column.propertyName];
282
273
  }
283
274
  }
275
+ else if (column.relationMetadata) {
276
+ // const relationMetadata = column.relationMetadata;
277
+ // // console.log(column.relationMetadata.propertyName);
278
+ // // console.log(column.relationMetadata.relationType);
279
+ // const value = plainObject[relationMetadata.propertyName];
280
+ // if (!value) continue;
281
+ // const relationType = relationMetadata.relationType;
282
+ // if (relationType === "one-to-one" || relationType === "many-to-one") {
283
+ // // @ts-ignore
284
+ // instance[relationMetadata.propertyName] = this.createEntityInstance(relationMetadata.type, value);
285
+ // } else if (relationType === "one-to-many" || relationType === "many-to-many") {
286
+ // // @ts-ignore
287
+ // instance[relationMetadata.propertyName] = value?.map((item: any) => {
288
+ // return this.createEntityInstance(relationMetadata.type, item);
289
+ // });
290
+ // }
291
+ }
284
292
  else {
285
293
  if (plainObject[column.propertyName] !== undefined) {
286
294
  instance[column.propertyName] = plainObject[column.propertyName];
@@ -288,8 +296,22 @@ class EggDataSource extends typeorm_1.DataSource {
288
296
  }
289
297
  }
290
298
  }
299
+ (_g = metadata.manyToOneRelations) === null || _g === void 0 ? void 0 : _g.forEach((relation) => {
300
+ const value = plainObject[relation.propertyName];
301
+ if (value) {
302
+ // @ts-ignore
303
+ instance[relation.propertyName] = this.createEntityInstance(relation.type, value);
304
+ }
305
+ });
306
+ (_h = metadata.oneToOneRelations) === null || _h === void 0 ? void 0 : _h.forEach((relation) => {
307
+ const value = plainObject[relation.propertyName];
308
+ if (value) {
309
+ // @ts-ignore
310
+ instance[relation.propertyName] = this.createEntityInstance(relation.type, value);
311
+ }
312
+ });
291
313
  // 一对多关系处理
292
- (_a = metadata.oneToManyRelations) === null || _a === void 0 ? void 0 : _a.forEach((relation) => {
314
+ (_j = metadata.oneToManyRelations) === null || _j === void 0 ? void 0 : _j.forEach((relation) => {
293
315
  const value = plainObject[relation.propertyName];
294
316
  if (Array.isArray(value)) {
295
317
  // @ts-ignore
@@ -299,7 +321,7 @@ class EggDataSource extends typeorm_1.DataSource {
299
321
  }
300
322
  });
301
323
  // 多对多关系处理
302
- (_b = metadata.manyToManyRelations) === null || _b === void 0 ? void 0 : _b.forEach((relation) => {
324
+ (_k = metadata.manyToManyRelations) === null || _k === void 0 ? void 0 : _k.forEach((relation) => {
303
325
  const value = plainObject[relation.propertyName];
304
326
  if (Array.isArray(value)) {
305
327
  // @ts-ignore
@@ -312,4 +334,4 @@ class EggDataSource extends typeorm_1.DataSource {
312
334
  }
313
335
  }
314
336
  exports.EggDataSource = EggDataSource;
315
- //# 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;IA6SvE,CAAC;IA5SA;;;;;;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;IAED;;OAEG;IACH,oBAAoB,CAA0B,WAA4B,EAAE,WAAgB;;QAC3F,kEAAkE;QAClE,MAAM,QAAQ,GAAG,IAAK,WAAmB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE/C,oBAAoB;QACpB,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YAClC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACvC,iDAAiD;gBACjD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAChC,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAC7C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;wBAC3B,KAAK,GAAG,KAAK,CAAC;oBACf,CAAC;yBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACtC,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;wBACxB,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACP,KAAK,GAAG,IAAI,CAAC;oBACd,CAAC;oBACD,KAAK,GAAG,KAAK,IAAI,IAAI,CAAC;oBAEtB,aAAa;oBACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpE,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;yBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACtC,aAAa;wBACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;oBACvC,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;yBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBACjC,aAAa;wBACb,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;oBACvC,CAAC;gBACF,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC3F,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACpE,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACxF,qCAAqC;oBACrC,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC/B,KAAK,GAAG,KAAK,CAAC;oBACf,CAAC;yBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACtC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC;yBAAM,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;wBACpC,KAAK,GAAG,KAAK,CAAC;oBACf,CAAC;yBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACtC,KAAK,GAAG,IAAI,CAAC;oBACd,CAAC;oBACD,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC;qBAAM,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;oBACpC,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;oBACjD,qDAAqD;oBACrD,qDAAqD;oBAErD,MAAM,KAAK,GAAG,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;oBACzD,IAAI,CAAC,KAAK;wBAAE,SAAS;oBAErB,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;oBACnD,IAAI,YAAY,KAAK,YAAY,IAAI,YAAY,KAAK,aAAa,EAAE,CAAC;wBACrE,aAAa;wBACb,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;oBACnG,CAAC;yBAAM,IAAI,YAAY,KAAK,aAAa,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;wBAC9E,aAAa;wBACb,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;4BAClE,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAC/D,CAAC,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,IAAI,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE,CAAC;wBACpD,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAClE,CAAC;gBACF,CAAC;YAEF,CAAC;QACF,CAAC;QAED,UAAU;QACV,MAAA,QAAQ,CAAC,kBAAkB,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjD,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,aAAa;gBACb,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;oBACzD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvD,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;QACH,UAAU;QACV,MAAA,QAAQ,CAAC,mBAAmB,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,aAAa;gBACb,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;oBACzD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvD,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;QACH,OAAO,QAAwB,CAAC;IACjC,CAAC;CACD;AAnTD,sCAmTC"}
337
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}
package/lib/Logger.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Agent, Application } from "egg";
2
- import { Logger, QueryRunner } from "typeorm";
2
+ import { Logger, QueryRunner } from "@ginreo/typeorm";
3
3
  export default class EggTypeORMLogger implements Logger {
4
4
  private app;
5
5
  constructor(app: Application | Agent);
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,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
- exports.createTypeORMDataSources = createTypeORMDataSources;
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,6 +1,6 @@
1
1
  {
2
2
  "name": "@diyaner/egg-typeorm",
3
- "version": "2.6.3",
3
+ "version": "3.0.0",
4
4
  "description": "egg plugin for nodejs orm freamwork typeorm.",
5
5
  "eggPlugin": {
6
6
  "name": "typeorm"
@@ -13,8 +13,8 @@
13
13
  "typeorm"
14
14
  ],
15
15
  "dependencies": {
16
- "reflect-metadata": "^0.1.14",
17
- "typeorm": "^0.3.25"
16
+ "@ginreo/typeorm": "^0.3.28",
17
+ "reflect-metadata": "^0.1.14"
18
18
  },
19
19
  "devDependencies": {
20
20
  "@types/mocha": "^8.2.1",
package/typeorm.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export * from "typeorm";
1
+ export * from "@ginreo/typeorm";
2
2
  export { EggDataSource } from "./lib/EggDataSource";
3
3
  import EggTypeORMLogger from "./lib/Logger";
4
4
  export { EggTypeORMLogger };
package/typeorm.js CHANGED
@@ -2,9 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EggTypeORMLogger = exports.EggDataSource = void 0;
4
4
  const tslib_1 = require("tslib");
5
- tslib_1.__exportStar(require("typeorm"), exports);
5
+ tslib_1.__exportStar(require("@ginreo/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
8
  const Logger_1 = require("./lib/Logger");
9
9
  exports.EggTypeORMLogger = Logger_1.default;
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLGtEQUF1QjtBQUN2QixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBO0FBQ3RCLHlDQUEyQztBQUNsQywyQkFERixnQkFBZ0IsQ0FDRSJ9
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZW9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInR5cGVvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUNBLDBEQUErQjtBQUMvQixxREFBbUQ7QUFBMUMsOEdBQUEsYUFBYSxPQUFBO0FBQ3RCLHlDQUEyQztBQUNsQywyQkFERixnQkFBZ0IsQ0FDRSJ9