@node-c/data-typeorm 1.0.0-beta0 → 1.0.0-beta1
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/dist/entityService/typeorm.entity.service.d.ts +3 -2
- package/dist/entityService/typeorm.entity.service.js +3 -2
- package/dist/entityService/typeorm.entity.service.js.map +1 -1
- package/dist/module/typeorm.module.js +4 -4
- package/dist/module/typeorm.module.js.map +1 -1
- package/package.json +3 -2
- package/src/entityService/typeorm.entity.service.ts +3 -2
- package/src/module/typeorm.module.ts +8 -4
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { ConfigProviderService, DataDefaultData } from '@node-c/core';
|
|
1
|
+
import { ConfigProviderService, DataDefaultData, LoggerService } from '@node-c/core';
|
|
2
2
|
import { RDBEntityService, SQLQueryBuilderService } from '@node-c/data-rdb';
|
|
3
3
|
import { EntitySchema, ObjectLiteral } from 'typeorm';
|
|
4
4
|
import { TypeORMDBRepository } from '../repository';
|
|
5
5
|
export declare class TypeORMDBEntityService<Entity extends ObjectLiteral, Data extends DataDefaultData<Entity> = DataDefaultData<Entity>> extends RDBEntityService<Entity, Data> {
|
|
6
6
|
protected configProvider: ConfigProviderService;
|
|
7
|
+
protected logger: LoggerService;
|
|
7
8
|
protected qb: SQLQueryBuilderService;
|
|
8
9
|
protected repository: TypeORMDBRepository<Entity>;
|
|
9
10
|
protected schema: EntitySchema;
|
|
10
11
|
protected primaryKeys: string[];
|
|
11
|
-
constructor(configProvider: ConfigProviderService, qb: SQLQueryBuilderService, repository: TypeORMDBRepository<Entity>, schema: EntitySchema);
|
|
12
|
+
constructor(configProvider: ConfigProviderService, logger: LoggerService, qb: SQLQueryBuilderService, repository: TypeORMDBRepository<Entity>, schema: EntitySchema);
|
|
12
13
|
}
|
|
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TypeORMDBEntityService = void 0;
|
|
4
4
|
const data_rdb_1 = require("@node-c/data-rdb");
|
|
5
5
|
class TypeORMDBEntityService extends data_rdb_1.RDBEntityService {
|
|
6
|
-
constructor(configProvider, qb, repository, schema) {
|
|
7
|
-
super(configProvider, qb, repository, schema);
|
|
6
|
+
constructor(configProvider, logger, qb, repository, schema) {
|
|
7
|
+
super(configProvider, logger, qb, repository, schema);
|
|
8
8
|
this.configProvider = configProvider;
|
|
9
|
+
this.logger = logger;
|
|
9
10
|
this.qb = qb;
|
|
10
11
|
this.repository = repository;
|
|
11
12
|
this.schema = schema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.entity.service.js","sourceRoot":"","sources":["../../src/entityService/typeorm.entity.service.ts"],"names":[],"mappings":";;;AACA,+CAA4E;AAM5E,MAAa,sBAGX,SAAQ,2BAA8B;IAGtC,YACY,cAAqC,EACrC,EAA0B,EAC1B,UAAuC,EACvC,MAAoB;QAE9B,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"typeorm.entity.service.js","sourceRoot":"","sources":["../../src/entityService/typeorm.entity.service.ts"],"names":[],"mappings":";;;AACA,+CAA4E;AAM5E,MAAa,sBAGX,SAAQ,2BAA8B;IAGtC,YACY,cAAqC,EACrC,MAAqB,EACrB,EAA0B,EAC1B,UAAuC,EACvC,MAAoB;QAE9B,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAN5C,mBAAc,GAAd,cAAc,CAAuB;QACrC,WAAM,GAAN,MAAM,CAAe;QACrB,OAAE,GAAF,EAAE,CAAwB;QAC1B,eAAU,GAAV,UAAU,CAA6B;QACvC,WAAM,GAAN,MAAM,CAAc;IAGhC,CAAC;CACF;AAfD,wDAeC"}
|
|
@@ -36,8 +36,8 @@ class TypeORMDBModule {
|
|
|
36
36
|
yield dataSource.initialize();
|
|
37
37
|
}
|
|
38
38
|
catch (err) {
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
const { failOnConnectionError = true, nodeCAppLoggerService } = (options || {});
|
|
40
|
+
nodeCAppLoggerService.error(`[TypeORMDBModule][${moduleName}]: Error connecting to the DB Server:`, err);
|
|
41
41
|
if (failOnConnectionError) {
|
|
42
42
|
throw err;
|
|
43
43
|
}
|
|
@@ -45,7 +45,7 @@ class TypeORMDBModule {
|
|
|
45
45
|
return dataSource;
|
|
46
46
|
}),
|
|
47
47
|
name: connectionName,
|
|
48
|
-
useFactory: (configProvider) => {
|
|
48
|
+
useFactory: (configProvider, logger) => {
|
|
49
49
|
const dataConfig = configProvider.config.data;
|
|
50
50
|
const { database, failOnConnectionError, host, password, port, type, typeormExtraOptions, user } = dataConfig[moduleName];
|
|
51
51
|
const dataSourceOptions = {};
|
|
@@ -60,7 +60,7 @@ class TypeORMDBModule {
|
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
62
|
return Object.assign(Object.assign(Object.assign({}, dataSourceOptions), { database, entities: entities, failOnConnectionError,
|
|
63
|
-
host, manualInitialization: true, name: connectionName, password,
|
|
63
|
+
host, manualInitialization: true, name: connectionName, nodeCAppLoggerService: logger, password,
|
|
64
64
|
port, synchronize: false, type: type === core_1.RDBType.Aurora ? core_1.RDBType.MySQL : type, username: user }), (typeormExtraOptions || {}));
|
|
65
65
|
},
|
|
66
66
|
inject: [core_1.ConfigProviderService]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.module.js","sourceRoot":"","sources":["../../src/module/typeorm.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAsE;AAGtE,
|
|
1
|
+
{"version":3,"file":"typeorm.module.js","sourceRoot":"","sources":["../../src/module/typeorm.module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@node-c/data-typeorm",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-beta1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
"check-types": "tsc -p tsconfig.build.json --noEmit",
|
|
10
10
|
"dev": "tsc -p tsconfig.build.json --watch",
|
|
11
11
|
"lint": "eslint src",
|
|
12
|
+
"lint:fix": "eslint src --fix",
|
|
12
13
|
"publish-package": "npm run build:clean && npm publish --access public",
|
|
13
14
|
"test": "vitest --config src/vitest.config.ts",
|
|
14
15
|
"test:coverage": "vitest --config src/vitest.config.ts --coverage"
|
|
@@ -16,7 +17,7 @@
|
|
|
16
17
|
"dependencies": {
|
|
17
18
|
"@nestjs/common": "^11.1.16",
|
|
18
19
|
"@nestjs/typeorm": "^11.0.0",
|
|
19
|
-
"@node-c/data-rdb": "^1.0.0-
|
|
20
|
+
"@node-c/data-rdb": "^1.0.0-beta1",
|
|
20
21
|
"class-validator": "^0.14.1",
|
|
21
22
|
"typeorm": "^0.3.20",
|
|
22
23
|
"uuid": "^11.0.5"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigProviderService, DataDefaultData } from '@node-c/core';
|
|
1
|
+
import { ConfigProviderService, DataDefaultData, LoggerService } from '@node-c/core';
|
|
2
2
|
import { RDBEntityService, SQLQueryBuilderService } from '@node-c/data-rdb';
|
|
3
3
|
|
|
4
4
|
import { EntitySchema, ObjectLiteral } from 'typeorm';
|
|
@@ -13,10 +13,11 @@ export class TypeORMDBEntityService<
|
|
|
13
13
|
|
|
14
14
|
constructor(
|
|
15
15
|
protected configProvider: ConfigProviderService,
|
|
16
|
+
protected logger: LoggerService,
|
|
16
17
|
protected qb: SQLQueryBuilderService,
|
|
17
18
|
protected repository: TypeORMDBRepository<Entity>,
|
|
18
19
|
protected schema: EntitySchema
|
|
19
20
|
) {
|
|
20
|
-
super(configProvider, qb, repository, schema);
|
|
21
|
+
super(configProvider, logger, qb, repository, schema);
|
|
21
22
|
}
|
|
22
23
|
}
|
|
@@ -2,7 +2,7 @@ import { DynamicModule } from '@nestjs/common';
|
|
|
2
2
|
import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm';
|
|
3
3
|
import { EntityClassOrSchema } from '@nestjs/typeorm/dist/interfaces/entity-class-or-schema.type';
|
|
4
4
|
|
|
5
|
-
import { AppConfigDataRDB, ConfigProviderService, RDBType, loadDynamicModules } from '@node-c/core';
|
|
5
|
+
import { AppConfigDataRDB, ConfigProviderService, LoggerService, RDBType, loadDynamicModules } from '@node-c/core';
|
|
6
6
|
import { SQLQueryBuilderModule } from '@node-c/data-rdb';
|
|
7
7
|
|
|
8
8
|
import { DataSource } from 'typeorm';
|
|
@@ -30,8 +30,11 @@ export class TypeORMDBModule {
|
|
|
30
30
|
dataSource = new DataSource(options!);
|
|
31
31
|
await dataSource.initialize();
|
|
32
32
|
} catch (err) {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
const { failOnConnectionError = true, nodeCAppLoggerService } = (options || {}) as {
|
|
34
|
+
failOnConnectionError?: boolean;
|
|
35
|
+
nodeCAppLoggerService: LoggerService;
|
|
36
|
+
};
|
|
37
|
+
nodeCAppLoggerService.error(`[TypeORMDBModule][${moduleName}]: Error connecting to the DB Server:`, err);
|
|
35
38
|
if (failOnConnectionError) {
|
|
36
39
|
throw err;
|
|
37
40
|
}
|
|
@@ -39,7 +42,7 @@ export class TypeORMDBModule {
|
|
|
39
42
|
return dataSource!;
|
|
40
43
|
},
|
|
41
44
|
name: connectionName,
|
|
42
|
-
useFactory: (configProvider: ConfigProviderService) => {
|
|
45
|
+
useFactory: (configProvider: ConfigProviderService, logger: LoggerService) => {
|
|
43
46
|
const dataConfig = configProvider.config.data;
|
|
44
47
|
// example : configProvider.config.data.db
|
|
45
48
|
const { database, failOnConnectionError, host, password, port, type, typeormExtraOptions, user } =
|
|
@@ -64,6 +67,7 @@ export class TypeORMDBModule {
|
|
|
64
67
|
host,
|
|
65
68
|
manualInitialization: true,
|
|
66
69
|
name: connectionName,
|
|
70
|
+
nodeCAppLoggerService: logger,
|
|
67
71
|
password,
|
|
68
72
|
port,
|
|
69
73
|
synchronize: false,
|