@rsdk/db.typeorm 5.0.0-next.2 → 5.0.0-next.4
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/CHANGELOG.md +14 -0
- package/dist/internal/context.d.ts +1 -1
- package/dist/internal/context.js +14 -14
- package/dist/internal/context.js.map +1 -1
- package/dist/metadata/override-entity.decorator.js +2 -2
- package/dist/metadata/override-entity.decorator.js.map +1 -1
- package/dist/metadata/typeorm-entity.decorator.js +2 -2
- package/dist/metadata/typeorm-entity.decorator.js.map +1 -1
- package/dist/providers/typeorm.config.d.ts +0 -1
- package/package.json +3 -3
- package/src/internal/context.ts +20 -20
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,20 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [5.0.0-next.4](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.3...v5.0.0-next.4) (2024-07-11)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
9
|
+
|
|
10
|
+
## [5.0.0-next.3](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.2...v5.0.0-next.3) (2024-07-11)
|
|
11
|
+
|
|
12
|
+
### ⚠ BREAKING CHANGES
|
|
13
|
+
|
|
14
|
+
* generalize tracing headers (#247)
|
|
15
|
+
|
|
16
|
+
### Features
|
|
17
|
+
|
|
18
|
+
* generalize tracing headers ([#247](https://github.com/R-Vision/rsdk/issues/247)) ([cee2ea6](https://github.com/R-Vision/rsdk/commit/cee2ea65c964705faf133397e285c051672c7512)), closes [#2](https://github.com/R-Vision/rsdk/issues/2) [#3](https://github.com/R-Vision/rsdk/issues/3) [#4](https://github.com/R-Vision/rsdk/issues/4) [#5](https://github.com/R-Vision/rsdk/issues/5)
|
|
19
|
+
|
|
6
20
|
## [5.0.0-next.2](https://github.com/R-Vision/rsdk/compare/v5.0.0-next.1...v5.0.0-next.2) (2024-07-10)
|
|
7
21
|
|
|
8
22
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
@@ -32,12 +32,12 @@ export declare class TypeOrmContext extends BaseContext<IsolationLevel> {
|
|
|
32
32
|
get queryRunner(): QueryRunner | undefined;
|
|
33
33
|
static create(isolationLevel: IsolationLevel): TypeOrmContext;
|
|
34
34
|
static createSuspended(): TypeOrmContext;
|
|
35
|
+
initialize(): Promise<void>;
|
|
35
36
|
/**
|
|
36
37
|
* Устанавливаем queryRunner который будет использоваться для инициализации транзакции
|
|
37
38
|
* @param queryRunner
|
|
38
39
|
*/
|
|
39
40
|
attach(queryRunner: QueryRunner): void;
|
|
40
|
-
initialize(): Promise<void>;
|
|
41
41
|
isInitialized(): boolean;
|
|
42
42
|
addNestLayer(): void;
|
|
43
43
|
rollbackTransaction(): Promise<void>;
|
package/dist/internal/context.js
CHANGED
|
@@ -54,6 +54,20 @@ class TypeOrmContext extends db_1.BaseContext {
|
|
|
54
54
|
static createSuspended() {
|
|
55
55
|
return new TypeOrmContext(true);
|
|
56
56
|
}
|
|
57
|
+
async initialize() {
|
|
58
|
+
if (this.suspended) {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
if (!this._queryRunner) {
|
|
62
|
+
throw new exceptions_1.QueryRunnerMustBeAttached();
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Инициализируем нужное количество `savepoint`
|
|
66
|
+
*/
|
|
67
|
+
for (this.transactionInitializedDepth; this.transactionInitializedDepth < this.nestDepth; this.transactionInitializedDepth++) {
|
|
68
|
+
await this._queryRunner.startTransaction();
|
|
69
|
+
}
|
|
70
|
+
}
|
|
57
71
|
/**
|
|
58
72
|
* Устанавливаем queryRunner который будет использоваться для инициализации транзакции
|
|
59
73
|
* @param queryRunner
|
|
@@ -70,20 +84,6 @@ class TypeOrmContext extends db_1.BaseContext {
|
|
|
70
84
|
}
|
|
71
85
|
this._queryRunner = queryRunner;
|
|
72
86
|
}
|
|
73
|
-
async initialize() {
|
|
74
|
-
if (this.suspended) {
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
|
-
if (!this._queryRunner) {
|
|
78
|
-
throw new exceptions_1.QueryRunnerMustBeAttached();
|
|
79
|
-
}
|
|
80
|
-
/**
|
|
81
|
-
* Инициализируем нужное количество `savepoint`
|
|
82
|
-
*/
|
|
83
|
-
for (this.transactionInitializedDepth; this.transactionInitializedDepth < this.nestDepth; this.transactionInitializedDepth++) {
|
|
84
|
-
await this._queryRunner.startTransaction();
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
87
|
isInitialized() {
|
|
88
88
|
return this.nestDepth === this.transactionInitializedDepth;
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAgD;AAChD,iCAAuC;AAIvC,oCAAoE;AAEpE,6CAOsB;AAEtB,MAAa,cAAe,SAAQ,gBAA2B;IACpD,eAAe,GAAG,uBAAe,CAAC;IAE3C;;;OAGG;IACK,YAAY,CAAe;IAEnC;;;OAGG;IACK,2BAA2B,GAAG,CAAC,CAAC;IACxC;;;;;OAKG;IACK,SAAS,GAAG,CAAC,CAAC;IAEtB;;;;OAIG;IACK,WAAW,GAAG,KAAK,CAAC;IAM5B,YAAoB,GAA2B;QAC7C,KAAK,CAAC,GAAG,IAAI,+BAAuB,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,cAA8B;QAC1C,OAAO,IAAI,cAAc,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,eAAe;QACpB,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.
|
|
4
|
+
exports.OverrideEntity = void 0;
|
|
5
|
+
exports.getOverrideEntityMetadata = getOverrideEntityMetadata;
|
|
5
6
|
const TYPEORM_OVERRIDE_ENTITY_METADATA = 'metadata:typeorm-override-entity';
|
|
6
7
|
/**
|
|
7
8
|
* Decorator for replacing one entity to another
|
|
@@ -13,5 +14,4 @@ exports.OverrideEntity = OverrideEntity;
|
|
|
13
14
|
function getOverrideEntityMetadata(entity) {
|
|
14
15
|
return Reflect.getMetadata(TYPEORM_OVERRIDE_ENTITY_METADATA, entity);
|
|
15
16
|
}
|
|
16
|
-
exports.getOverrideEntityMetadata = getOverrideEntityMetadata;
|
|
17
17
|
//# sourceMappingURL=override-entity.decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"override-entity.decorator.js","sourceRoot":"","sources":["../../src/metadata/override-entity.decorator.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;
|
|
1
|
+
{"version":3,"file":"override-entity.decorator.js","sourceRoot":"","sources":["../../src/metadata/override-entity.decorator.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AA2BjD,8DAIC;AAnBD,MAAM,gCAAgC,GAAG,kCAAkC,CAAC;AAE5E;;GAEG;AACI,MAAM,cAAc,GACzB,CAAC,qBAA4C,EAAkB,EAAE,CACjE,CAAC,MAAsC,EAAE,EAAE;IACzC,OAAO,CAAC,cAAc,CACpB,gCAAgC,EAChC,qBAAqB,EACrB,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AARS,QAAA,cAAc,kBAQvB;AAEJ,SAAgB,yBAAyB,CACvC,MAA+C;IAE/C,OAAO,OAAO,CAAC,WAAW,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.
|
|
4
|
+
exports.TypeOrmEntity = void 0;
|
|
5
|
+
exports.getTypeOrmEntityMetadata = getTypeOrmEntityMetadata;
|
|
5
6
|
const TYPEORM_ENTITY_METADATA = 'metadata:typeorm-entity';
|
|
6
7
|
/**
|
|
7
8
|
* Decorator for set our options
|
|
@@ -13,5 +14,4 @@ exports.TypeOrmEntity = TypeOrmEntity;
|
|
|
13
14
|
function getTypeOrmEntityMetadata(entity) {
|
|
14
15
|
return Reflect.getMetadata(TYPEORM_ENTITY_METADATA, entity);
|
|
15
16
|
}
|
|
16
|
-
exports.getTypeOrmEntityMetadata = getTypeOrmEntityMetadata;
|
|
17
17
|
//# sourceMappingURL=typeorm-entity.decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-entity.decorator.js","sourceRoot":"","sources":["../../src/metadata/typeorm-entity.decorator.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;
|
|
1
|
+
{"version":3,"file":"typeorm-entity.decorator.js","sourceRoot":"","sources":["../../src/metadata/typeorm-entity.decorator.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AA2BjD,4DAIC;AAnBD,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAE1D;;GAEG;AACI,MAAM,aAAa,GACxB,CAAC,oBAA0C,EAAkB,EAAE,CAC/D,CAAC,MAAsC,EAAE,EAAE;IACzC,OAAO,CAAC,cAAc,CACpB,uBAAuB,EACvB,oBAAoB,EACpB,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AARS,QAAA,aAAa,iBAQtB;AAEJ,SAAgB,wBAAwB,CACtC,MAA+C;IAE/C,OAAO,OAAO,CAAC,WAAW,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAC9D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db.typeorm",
|
|
3
|
-
"version": "5.0.0-next.
|
|
3
|
+
"version": "5.0.0-next.4",
|
|
4
4
|
"description": "TypeOrm module for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"@rsdk/logging": "*",
|
|
26
26
|
"@rsdk/nest-tools": "*",
|
|
27
27
|
"reflect-metadata": "^0.1.12 || ^0.2.0",
|
|
28
|
-
"rxjs": "^7.
|
|
28
|
+
"rxjs": "^7.8.1",
|
|
29
29
|
"typeorm": "^0.3.12"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "8f0a0ae9d8d01ef98ce95cb4aa1c28638f376b69"
|
|
32
32
|
}
|
package/src/internal/context.ts
CHANGED
|
@@ -67,26 +67,6 @@ export class TypeOrmContext extends BaseContext<IsolationLevel> {
|
|
|
67
67
|
return new TypeOrmContext(true);
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
/**
|
|
71
|
-
* Устанавливаем queryRunner который будет использоваться для инициализации транзакции
|
|
72
|
-
* @param queryRunner
|
|
73
|
-
*/
|
|
74
|
-
attach(queryRunner: QueryRunner): void {
|
|
75
|
-
if (this._queryRunner) {
|
|
76
|
-
throw new AlreadyAttached();
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
if (queryRunner.isTransactionActive) {
|
|
80
|
-
throw new QueryRunnerIsTransactionActive();
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
if (queryRunner.isReleased) {
|
|
84
|
-
throw new QueryRunnerIsReleased();
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
this._queryRunner = queryRunner;
|
|
88
|
-
}
|
|
89
|
-
|
|
90
70
|
@Concurrency()
|
|
91
71
|
async initialize(): Promise<void> {
|
|
92
72
|
if (this.suspended) {
|
|
@@ -109,6 +89,26 @@ export class TypeOrmContext extends BaseContext<IsolationLevel> {
|
|
|
109
89
|
}
|
|
110
90
|
}
|
|
111
91
|
|
|
92
|
+
/**
|
|
93
|
+
* Устанавливаем queryRunner который будет использоваться для инициализации транзакции
|
|
94
|
+
* @param queryRunner
|
|
95
|
+
*/
|
|
96
|
+
attach(queryRunner: QueryRunner): void {
|
|
97
|
+
if (this._queryRunner) {
|
|
98
|
+
throw new AlreadyAttached();
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
if (queryRunner.isTransactionActive) {
|
|
102
|
+
throw new QueryRunnerIsTransactionActive();
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
if (queryRunner.isReleased) {
|
|
106
|
+
throw new QueryRunnerIsReleased();
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
this._queryRunner = queryRunner;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
112
|
isInitialized(): boolean {
|
|
113
113
|
return this.nestDepth === this.transactionInitializedDepth;
|
|
114
114
|
}
|