@rsdk/db.knex 5.4.0-next.0 → 5.4.0-next.10

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 CHANGED
@@ -3,10 +3,64 @@
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.4.0-next.10](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.9...v5.4.0-next.10) (2024-12-03)
7
+
8
+ **Note:** Version bump only for package @rsdk/db.knex
9
+
10
+ ## [5.4.0-next.9](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.8...v5.4.0-next.9) (2024-12-02)
11
+
12
+ ## [5.3.1-rc.1](https://github.com/R-Vision/rsdk/compare/v5.3.1-rc.0...v5.3.1-rc.1) (2024-11-28)
13
+
14
+ ## [5.3.1-rc.0](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.6...v5.3.1-rc.0) (2024-11-28)
15
+
16
+ **Note:** Version bump only for package @rsdk/db.knex
17
+
18
+ ## [5.4.0-next.8](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.7...v5.4.0-next.8) (2024-11-28)
19
+
20
+ **Note:** Version bump only for package @rsdk/db.knex
21
+
22
+ ## [5.4.0-next.7](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.6...v5.4.0-next.7) (2024-11-28)
23
+
24
+ ### Features
25
+
26
+ * eslint rule lines-around-comment ([65083bd](https://github.com/R-Vision/rsdk/commit/65083bd2e084344e08f2124e39afbbc23fdaa4f4))
27
+
28
+ ## [5.4.0-next.6](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.5...v5.4.0-next.6) (2024-11-28)
29
+
30
+ **Note:** Version bump only for package @rsdk/db.knex
31
+
32
+ ## [5.4.0-next.5](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.4...v5.4.0-next.5) (2024-11-28)
33
+
34
+ **Note:** Version bump only for package @rsdk/db.knex
35
+
36
+ ## [5.4.0-next.4](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.3...v5.4.0-next.4) (2024-11-27)
37
+
38
+ **Note:** Version bump only for package @rsdk/db.knex
39
+
40
+ ## [5.4.0-next.3](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.2...v5.4.0-next.3) (2024-11-25)
41
+
42
+ **Note:** Version bump only for package @rsdk/db.knex
43
+
44
+ ## [5.4.0-next.2](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.1...v5.4.0-next.2) (2024-11-25)
45
+
46
+ **Note:** Version bump only for package @rsdk/db.knex
47
+
48
+ ## [5.4.0-next.1](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.0...v5.4.0-next.1) (2024-11-08)
49
+
50
+ **Note:** Version bump only for package @rsdk/db.knex
51
+
6
52
  ## [5.4.0-next.0](https://github.com/R-Vision/rsdk/compare/v5.3.0...v5.4.0-next.0) (2024-11-08)
7
53
 
8
54
  **Note:** Version bump only for package @rsdk/db.knex
9
55
 
56
+ ## [5.3.1-rc.1](https://github.com/R-Vision/rsdk/compare/v5.3.1-rc.0...v5.3.1-rc.1) (2024-11-28)
57
+
58
+ **Note:** Version bump only for package @rsdk/db.knex
59
+
60
+ ## [5.3.1-rc.0](https://github.com/R-Vision/rsdk/compare/v5.3.0...v5.3.1-rc.0) (2024-11-28)
61
+
62
+ **Note:** Version bump only for package @rsdk/db.knex
63
+
10
64
  ## [5.3.0](https://github.com/R-Vision/rsdk/compare/v5.3.0-next.4...v5.3.0) (2024-11-08)
11
65
 
12
66
  **Note:** Version bump only for package @rsdk/db.knex
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.KnexContext = void 0;
16
16
  /* eslint-disable @typescript-eslint/ban-ts-comment */
17
+ // eslint-disable-next-line simple-import-sort/imports
17
18
  const common_node_1 = require("@rsdk/common.node");
18
19
  const db_1 = require("@rsdk/db");
19
20
  /**
@@ -96,11 +97,10 @@ class KnexContext extends db_1.BaseContext {
96
97
  const requiredLayerCount = this.nestDepth - this.layers.length;
97
98
  for (let i = 0; i < requiredLayerCount; i++) {
98
99
  const existedLayer = this.layers.at(-1);
99
- const existedTrx =
100
100
  /**
101
101
  * Если до этого транзакция уже была проинициализирована, то используем существующей trx для создания `savepoint`
102
102
  */
103
- existedLayer &&
103
+ const existedTrx = existedLayer &&
104
104
  (existedLayer?.trx ??
105
105
  (existedLayer.trx = await this.makeKnex(existedLayer.runner)));
106
106
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/internal/context.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,sDAAsD;AACtD,mDAAgD;AAChD,iCAAuC;AAGvC;;;GAGG;AACH,aAAa;AACb,uEAA8D;AAG9D,oCAAoE;AAEpE,6CAOsB;AAqBtB,MAAa,WAAY,SAAQ,gBAA2B;IACjD,eAAe,GAAG,uBAAe,CAAC;IAE3C;;;;OAIG;IACK,MAAM,GAAuB,EAAE,CAAC;IAExC;;;;;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;;;;OAIG;IACH,IAAI,sBAAsB;QACxB,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,cAA8B;QAC1C,OAAO,IAAI,WAAW,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe;QACpB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;OAGG;IAEG,AAAN,KAAK,CAAC,UAAU,CAAC,aAAyB;QACxC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,gBAAM,CACvB,aAAa,CAAC,MAAM;YAEpB;;eAEG;YACH,aAAa,CAAC,OAAO,CACtB,CAAC;YAEF,IAAI,CAAC,MAAM,GAAG;gBACZ;oBACE,MAAM,EAAE,MAAM;iBACf;aACF,CAAC;QACJ,CAAC;QAED;;;WAGG;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAExC;;eAEG;YACH,MAAM,UAAU,GACd,YAAY;gBACZ,CAAC,YAAY,EAAE,GAAG;oBAChB,CAAC,YAAY,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAEnE;;;eAGG;YACH,MAAM,cAAc,GAAG,MAAM,IAAI,OAAO,CACtC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAClB,UAAU;gBACR,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;gBAChD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CACzD,CAAC;YAEF,MAAM,iBAAiB,GAAG,IAAI,gBAAM,CAClC,cAAc,CAAC,MAAM;YAErB;;eAEG;YACH,aAAa,CAAC,OAAO,CACtB,CAAC;YACF,MAAM,mBAAmB,GAAG;gBAC1B,MAAM,EAAE,iBAAiB;gBACzB,GAAG,EAAE,cAAc;aACpB,CAAC;YAEF,aAAa;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,UAAsB;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,mCAAsB,EAAE,CAAC;QACrC,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAEzE,MAAM,iBAAiB,GAAG,IAAI,gBAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAErE;;;;;;;;;;WAUG;QACH,iBAAiB,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;QAEvD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,YAAY;QACV,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,8CAAiC,EAAE,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED;;WAEG;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED;;WAEG;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ,CAAC,WAAoB;QACjC,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxC;;eAEG;YACH,MAAM,IAAI,yCAA4B,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;QAEpB;;WAEG;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAElD;;WAEG;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QAE5C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B;;;WAGG;QACH,IAAI,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,MAAM,IAAI,yBAAY,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,8BAAiB,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,WAAW;QACT,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,iDAAoC,EAAE,CAAC;QACnD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,aAAyB;QAC9C,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CACpC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CACjD,CAAC;IACJ,CAAC;CACF;AAzQD,kCAyQC;AA1MO;IADL,IAAA,yBAAW,GAAE;;;;6CAmEb"}
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.Initializer = void 0;
7
7
  /* eslint-disable @typescript-eslint/ban-ts-comment */
8
+ // eslint-disable-next-line simple-import-sort/imports
8
9
  const db_1 = require("@rsdk/db");
9
10
  // @ts-ignore
10
11
  const runner_1 = __importDefault(require("knex/lib/execution/runner"));
@@ -1 +1 @@
1
- {"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../src/internal/initializer.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAsD;AACtD,iCAA0C;AAC1C,aAAa;AACb,uEAA8D;AAG9D,6CAAiD;AAEjD,MAAM,WAAW,GAAG,gBAAM,CAAC,SAAS,CAAC,GAAG,CAAC;AAEzC,MAAa,WAAW;IACtB,MAAM,CAAU,OAAO,GAAG,IAAI,mBAAc,EAAe,CAAC;IAE5D;;OAEG;IACH,MAAM,CAAC,UAAU;QACf,MAAM,CAAC,cAAc,CAAC,gBAAM,CAAC,SAAS,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,KAAK,WAA6B,GAAG,IAAW;gBACrD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;gBACzC,CAAC;gBAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;oBACvB,MAAM,IAAI,8BAAiB,EAAE,CAAC;gBAChC,CAAC;gBAED;;mBAEG;gBACH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAE/B;;mBAEG;gBACH,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBAE9D,IAAI,CAAC;oBACH,OAAO,MAAM,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC;gBACxD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;;AApCH,kCAqCC"}
1
+ {"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../src/internal/initializer.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAsD;AACtD,sDAAsD;AACtD,iCAA0C;AAE1C,aAAa;AACb,uEAA8D;AAG9D,6CAAiD;AAEjD,MAAM,WAAW,GAAG,gBAAM,CAAC,SAAS,CAAC,GAAG,CAAC;AAEzC,MAAa,WAAW;IACtB,MAAM,CAAU,OAAO,GAAG,IAAI,mBAAc,EAAe,CAAC;IAE5D;;OAEG;IACH,MAAM,CAAC,UAAU;QACf,MAAM,CAAC,cAAc,CAAC,gBAAM,CAAC,SAAS,EAAE,KAAK,EAAE;YAC7C,KAAK,EAAE,KAAK,WAA6B,GAAG,IAAW;gBACrD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;gBACzC,CAAC;gBAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;oBACvB,MAAM,IAAI,8BAAiB,EAAE,CAAC;gBAChC,CAAC;gBAED;;mBAEG;gBACH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAE/B;;mBAEG;gBACH,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBAE9D,IAAI,CAAC;oBACH,OAAO,MAAM,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC;gBACxD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;;AApCH,kCAqCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/db.knex",
3
- "version": "5.4.0-next.0",
3
+ "version": "5.4.0-next.10",
4
4
  "description": "Knex integration for platform",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -25,5 +25,5 @@
25
25
  "reflect-metadata": "^0.1.12 || ^0.2.0",
26
26
  "rxjs": "^7.8.1"
27
27
  },
28
- "gitHead": "dbf3d3d95c8c68c21313e7cf86eef9e50fe3ef78"
28
+ "gitHead": "e069174778f5d22396099fddfe3b10c4f30b467d"
29
29
  }
@@ -1,7 +1,9 @@
1
1
  /* eslint-disable @typescript-eslint/ban-ts-comment */
2
+ // eslint-disable-next-line simple-import-sort/imports
2
3
  import { Concurrency } from '@rsdk/common.node';
3
4
  import { BaseContext } from '@rsdk/db';
4
5
  import type { Knex } from 'knex';
6
+
5
7
  /**
6
8
  ts-ignore потому что в тайпингах этого нет, а тайпингов нет потому что knex ~~говно~~ написан на js, и тайпинги написаны руками,
7
9
  руками которые не написали тайпинги для внутренних вещей
@@ -42,12 +44,14 @@ type KnexContextLayer = {
42
44
 
43
45
  export class KnexContext extends BaseContext<IsolationLevel> {
44
46
  readonly isolationLevels = isolationLevels;
47
+
45
48
  /**
46
49
  * Массив слоёв в котором каждый trx и runner соответствует вложенности
47
50
  * Необходимо для поддержки savepoint
48
51
  * @private
49
52
  */
50
53
  private layers: KnexContextLayer[] = [];
54
+
51
55
  /**
52
56
  * Глубина вложенности
53
57
  * Не путать с индексом вложенности
@@ -109,6 +113,7 @@ export class KnexContext extends BaseContext<IsolationLevel> {
109
113
 
110
114
  const runner = new Runner(
111
115
  settledRunner.client,
116
+
112
117
  /**
113
118
  * Билдер в данном случае не имеет принципиального значения, сделано больше для соблюдения API, практического значения не имеет
114
119
  */
@@ -130,10 +135,11 @@ export class KnexContext extends BaseContext<IsolationLevel> {
130
135
 
131
136
  for (let i = 0; i < requiredLayerCount; i++) {
132
137
  const existedLayer = this.layers.at(-1);
138
+
139
+ /**
140
+ * Если до этого транзакция уже была проинициализирована, то используем существующей trx для создания `savepoint`
141
+ */
133
142
  const existedTrx =
134
- /**
135
- * Если до этого транзакция уже была проинициализирована, то используем существующей trx для создания `savepoint`
136
- */
137
143
  existedLayer &&
138
144
  (existedLayer?.trx ??
139
145
  (existedLayer.trx = await this.makeKnex(existedLayer.runner)));
@@ -151,6 +157,7 @@ export class KnexContext extends BaseContext<IsolationLevel> {
151
157
 
152
158
  const transactionRunner = new Runner(
153
159
  initializedTrx.client,
160
+
154
161
  /**
155
162
  * Билдер в данном случае не имеет принципиального значения, сделано больше для соблюдения API, практического значения не имеет
156
163
  */
@@ -1,5 +1,7 @@
1
1
  /* eslint-disable @typescript-eslint/ban-ts-comment */
2
+ // eslint-disable-next-line simple-import-sort/imports
2
3
  import { ContextStorage } from '@rsdk/db';
4
+
3
5
  // @ts-ignore
4
6
  import { default as Runner } from 'knex/lib/execution/runner';
5
7
 
@@ -850,10 +850,12 @@ describe('REQUIRES_NEW', () => {
850
850
  it('correct run new transaction', async () => {
851
851
  const testedFunc = async (): Promise<void> => {
852
852
  contextTransactionMustNotInitialized();
853
+
853
854
  /**
854
855
  * Не должно задействовать текущее соединение
855
856
  */
856
857
  await contextDoSuccessful();
858
+
857
859
  /**
858
860
  * Убеждаемся в том что текущий контекст так и не был проинициализирован
859
861
  */
@@ -870,6 +872,7 @@ describe('REQUIRES_NEW', () => {
870
872
  const cats = await fetchCats();
871
873
 
872
874
  expect(cats).toEqual([cat]);
875
+
873
876
  /**
874
877
  * Исключения не будет так как будет использовано другое соединение
875
878
  */
@@ -1005,6 +1008,7 @@ describe('SUPPORTS', () => {
1005
1008
  it('correct run for incompatible isolation levels', async () => {
1006
1009
  const testedFunc = async (): Promise<void> => {
1007
1010
  await createCat();
1011
+
1008
1012
  /**
1009
1013
  * Всё должно сработать так как мы создаём новую транзакцию
1010
1014
  */