@rsdk/db.knex 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 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.knex
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.knex
@@ -43,17 +43,17 @@ export declare class KnexContext extends BaseContext<IsolationLevel> {
43
43
  * Прежде всего необходимо для имплементации NOT_SUPPORTED propagation
44
44
  */
45
45
  static createSuspended(): KnexContext;
46
+ /**
47
+ * Метод инициализирует необходимые слои для корректной работы savepoint
48
+ * @param settledRunner
49
+ */
50
+ initialize(settledRunner: KnexRunner): Promise<void>;
46
51
  /**
47
52
  * Создаём новый runner для запуска метода `run`
48
53
  * Необходимо из-за того что builder определяется при создании `runner`
49
54
  * @param knexRunner
50
55
  */
51
56
  createContextRunner(knexRunner: KnexRunner): Promise<KnexRunner>;
52
- /**
53
- * Метод инициализирует необходимые слои для корректной работы savepoint
54
- * @param settledRunner
55
- */
56
- initialize(settledRunner: KnexRunner): Promise<void>;
57
57
  /**
58
58
  * Должен быть вызван перед тем как запускать функцию, подразумевающую вложенный уровень транзакционности
59
59
  */
@@ -69,35 +69,6 @@ class KnexContext extends db_1.BaseContext {
69
69
  static createSuspended() {
70
70
  return new KnexContext(true);
71
71
  }
72
- /**
73
- * Создаём новый runner для запуска метода `run`
74
- * Необходимо из-за того что builder определяется при создании `runner`
75
- * @param knexRunner
76
- */
77
- async createContextRunner(knexRunner) {
78
- const layer = this.layers.at(this.nestDepth - 1);
79
- if (!layer) {
80
- throw new exceptions_1.LayerMustBeInitialized();
81
- }
82
- if (this.suspended) {
83
- return knexRunner;
84
- }
85
- const trx = layer.trx ?? (layer.trx = await this.makeKnex(layer.runner));
86
- const transactionRunner = new runner_1.default(trx.client, knexRunner.builder);
87
- /**
88
- * Для того чтобы он точно использовал подключение уже существующего queryRunner, а не пытался его проинициализировать
89
- * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L30
90
- * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L281
91
- *
92
- * Такой же хак используется в самом knex
93
- * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L246
94
- *
95
- * Не думаю что есть повод беспокоиться о том что runner может взять подключение у builder, это делается форсировано самим пользователем,
96
- * по крайней мере на данный момент я не нашёл использования этого внутри `knex`
97
- */
98
- transactionRunner.connection = layer.runner.connection;
99
- return transactionRunner;
100
- }
101
72
  /**
102
73
  * Метод инициализирует необходимые слои для корректной работы savepoint
103
74
  * @param settledRunner
@@ -152,6 +123,35 @@ class KnexContext extends db_1.BaseContext {
152
123
  this.layers.push(newKnexContextLayer);
153
124
  }
154
125
  }
126
+ /**
127
+ * Создаём новый runner для запуска метода `run`
128
+ * Необходимо из-за того что builder определяется при создании `runner`
129
+ * @param knexRunner
130
+ */
131
+ async createContextRunner(knexRunner) {
132
+ const layer = this.layers.at(this.nestDepth - 1);
133
+ if (!layer) {
134
+ throw new exceptions_1.LayerMustBeInitialized();
135
+ }
136
+ if (this.suspended) {
137
+ return knexRunner;
138
+ }
139
+ const trx = layer.trx ?? (layer.trx = await this.makeKnex(layer.runner));
140
+ const transactionRunner = new runner_1.default(trx.client, knexRunner.builder);
141
+ /**
142
+ * Для того чтобы он точно использовал подключение уже существующего queryRunner, а не пытался его проинициализировать
143
+ * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L30
144
+ * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L281
145
+ *
146
+ * Такой же хак используется в самом knex
147
+ * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L246
148
+ *
149
+ * Не думаю что есть повод беспокоиться о том что runner может взять подключение у builder, это делается форсировано самим пользователем,
150
+ * по крайней мере на данный момент я не нашёл использования этого внутри `knex`
151
+ */
152
+ transactionRunner.connection = layer.runner.connection;
153
+ return transactionRunner;
154
+ }
155
155
  /**
156
156
  * Должен быть вызван перед тем как запускать функцию, подразумевающую вложенный уровень транзакционности
157
157
  */
@@ -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":"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"}
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { Timespan } from '@rsdk/common';
3
2
  import { Config } from '@rsdk/core';
4
3
  export declare class KnexPluginConfig extends Config {
@@ -6,8 +6,8 @@ export declare class KnexFactory implements OnApplicationShutdown {
6
6
  private readonly appName;
7
7
  private readonly logger;
8
8
  private readonly config;
9
+ private instance;
9
10
  constructor(appName: string, logger: ILogger, config: KnexPluginConfig);
10
11
  create(driver: string): Promise<Knex>;
11
12
  onApplicationShutdown(): Promise<void>;
12
- private instance;
13
13
  }
@@ -23,6 +23,7 @@ let KnexFactory = class KnexFactory {
23
23
  appName;
24
24
  logger;
25
25
  config;
26
+ instance = null;
26
27
  constructor(appName, logger, config) {
27
28
  this.appName = appName;
28
29
  this.logger = logger;
@@ -83,7 +84,6 @@ let KnexFactory = class KnexFactory {
83
84
  await this.instance.destroy();
84
85
  }
85
86
  }
86
- instance = null;
87
87
  };
88
88
  exports.KnexFactory = KnexFactory;
89
89
  exports.KnexFactory = KnexFactory = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"knex.factory.js","sourceRoot":"","sources":["../../src/providers/knex.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2CAA4C;AAC5C,qCAAmD;AAGnD,+BAA4B;AAC5B,mDAAkD;AAElD,+CAAiD;AACjD,+DAA0D;AAGnD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEQ;IACgB;IAC3B;IAHnB,YAC8B,OAAe,EACC,MAAe,EAC1C,MAAwB;QAFb,YAAO,GAAP,OAAO,CAAQ;QACC,WAAM,GAAN,MAAM,CAAS;QAC1C,WAAM,GAAN,MAAM,CAAkB;IACxC,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,MAAc;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAA,WAAI,EAAC;YACnB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,uCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;YACvC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;YACtC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI;gBACxB,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;aACjC,CAAC;YACF,IAAI,EAAE;gBACJ,8DAA8D;gBAC9D,WAAW,EAAE,KAAK,EAAE,UAAe,EAAE,IAAS,EAAE,EAAE;oBAChD,MAAM,OAAO,GAAG;wBACd,qBAAqB;wBACrB,yBAAyB,IAAI,CAAC,OAAO,SAAS;qBAC/C,CAAC;oBAEF,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3C,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACzB,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBACxB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aACzB;SACF,CAAC,CAAC;QAEH;;;;;;;;;;;WAWG;QAEH,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACpC,MAAM;YACR,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,kBAAkB,EAAE,KAAc,CAAC,CAAC;gBACvE,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,QAAQ,GAAgB,IAAI,CAAC;CACtC,CAAA;AAtEY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,cAAO,GAAE,CAAA;IACT,WAAA,IAAA,mBAAY,EAAC,WAAW,CAAC,CAAA;qDACD,8BAAgB;GAJhC,WAAW,CAsEvB"}
1
+ {"version":3,"file":"knex.factory.js","sourceRoot":"","sources":["../../src/providers/knex.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2CAA4C;AAC5C,qCAAmD;AAGnD,+BAA4B;AAC5B,mDAAkD;AAElD,+CAAiD;AACjD,+DAA0D;AAGnD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAIQ;IACgB;IAC3B;IALX,QAAQ,GAAgB,IAAI,CAAC;IAErC,YAC8B,OAAe,EACC,MAAe,EAC1C,MAAwB;QAFb,YAAO,GAAP,OAAO,CAAQ;QACC,WAAM,GAAN,MAAM,CAAS;QAC1C,WAAM,GAAN,MAAM,CAAkB;IACxC,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,MAAc;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAA,WAAI,EAAC;YACnB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,uCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;YACvC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;YACtC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI;gBACxB,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;aACjC,CAAC;YACF,IAAI,EAAE;gBACJ,8DAA8D;gBAC9D,WAAW,EAAE,KAAK,EAAE,UAAe,EAAE,IAAS,EAAE,EAAE;oBAChD,MAAM,OAAO,GAAG;wBACd,qBAAqB;wBACrB,yBAAyB,IAAI,CAAC,OAAO,SAAS;qBAC/C,CAAC;oBAEF,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3C,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACzB,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBACxB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aACzB;SACF,CAAC,CAAC;QAEH;;;;;;;;;;;WAWG;QAEH,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACpC,MAAM;YACR,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,kBAAkB,EAAE,KAAc,CAAC,CAAC;gBACvE,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;CACF,CAAA;AAtEY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,cAAO,GAAE,CAAA;IACT,WAAA,IAAA,mBAAY,EAAC,WAAW,CAAC,CAAA;qDACD,8BAAgB;GANhC,WAAW,CAsEvB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/db.knex",
3
- "version": "5.0.0-next.2",
3
+ "version": "5.0.0-next.4",
4
4
  "description": "Knex integration for platform",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -23,7 +23,7 @@
23
23
  "@rsdk/logging": "*",
24
24
  "knex": "^2.4.2",
25
25
  "reflect-metadata": "^0.1.12 || ^0.2.0",
26
- "rxjs": "^7.0.0"
26
+ "rxjs": "^7.8.1"
27
27
  },
28
- "gitHead": "b1e624d9bd7734c4346cb5747feea7d2199535d0"
28
+ "gitHead": "8f0a0ae9d8d01ef98ce95cb4aa1c28638f376b69"
29
29
  }
@@ -96,41 +96,6 @@ export class KnexContext extends BaseContext<IsolationLevel> {
96
96
  return new KnexContext(true);
97
97
  }
98
98
 
99
- /**
100
- * Создаём новый runner для запуска метода `run`
101
- * Необходимо из-за того что builder определяется при создании `runner`
102
- * @param knexRunner
103
- */
104
- async createContextRunner(knexRunner: KnexRunner): Promise<KnexRunner> {
105
- const layer = this.layers.at(this.nestDepth - 1);
106
- if (!layer) {
107
- throw new LayerMustBeInitialized();
108
- }
109
-
110
- if (this.suspended) {
111
- return knexRunner;
112
- }
113
-
114
- const trx = layer.trx ?? (layer.trx = await this.makeKnex(layer.runner));
115
-
116
- const transactionRunner = new Runner(trx.client, knexRunner.builder);
117
-
118
- /**
119
- * Для того чтобы он точно использовал подключение уже существующего queryRunner, а не пытался его проинициализировать
120
- * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L30
121
- * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L281
122
- *
123
- * Такой же хак используется в самом knex
124
- * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L246
125
- *
126
- * Не думаю что есть повод беспокоиться о том что runner может взять подключение у builder, это делается форсировано самим пользователем,
127
- * по крайней мере на данный момент я не нашёл использования этого внутри `knex`
128
- */
129
- transactionRunner.connection = layer.runner.connection;
130
-
131
- return transactionRunner;
132
- }
133
-
134
99
  /**
135
100
  * Метод инициализирует необходимые слои для корректной работы savepoint
136
101
  * @param settledRunner
@@ -201,6 +166,41 @@ export class KnexContext extends BaseContext<IsolationLevel> {
201
166
  }
202
167
  }
203
168
 
169
+ /**
170
+ * Создаём новый runner для запуска метода `run`
171
+ * Необходимо из-за того что builder определяется при создании `runner`
172
+ * @param knexRunner
173
+ */
174
+ async createContextRunner(knexRunner: KnexRunner): Promise<KnexRunner> {
175
+ const layer = this.layers.at(this.nestDepth - 1);
176
+ if (!layer) {
177
+ throw new LayerMustBeInitialized();
178
+ }
179
+
180
+ if (this.suspended) {
181
+ return knexRunner;
182
+ }
183
+
184
+ const trx = layer.trx ?? (layer.trx = await this.makeKnex(layer.runner));
185
+
186
+ const transactionRunner = new Runner(trx.client, knexRunner.builder);
187
+
188
+ /**
189
+ * Для того чтобы он точно использовал подключение уже существующего queryRunner, а не пытался его проинициализировать
190
+ * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L30
191
+ * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L281
192
+ *
193
+ * Такой же хак используется в самом knex
194
+ * https://github.com/knex/knex/blob/42b91980b7de281a4c53910f9af32da4462a9c5a/lib/execution/runner.js#L246
195
+ *
196
+ * Не думаю что есть повод беспокоиться о том что runner может взять подключение у builder, это делается форсировано самим пользователем,
197
+ * по крайней мере на данный момент я не нашёл использования этого внутри `knex`
198
+ */
199
+ transactionRunner.connection = layer.runner.connection;
200
+
201
+ return transactionRunner;
202
+ }
203
+
204
204
  /**
205
205
  * Должен быть вызван перед тем как запускать функцию, подразумевающую вложенный уровень транзакционности
206
206
  */
@@ -11,6 +11,8 @@ import { KnexLoggerAdapter } from './knex-logger.adapter';
11
11
 
12
12
  @Injectable()
13
13
  export class KnexFactory implements OnApplicationShutdown {
14
+ private instance: Knex | null = null;
15
+
14
16
  constructor(
15
17
  @AppName() private readonly appName: string,
16
18
  @InjectLogger(KnexFactory) private readonly logger: ILogger,
@@ -78,6 +80,4 @@ export class KnexFactory implements OnApplicationShutdown {
78
80
  await this.instance.destroy();
79
81
  }
80
82
  }
81
-
82
- private instance: Knex | null = null;
83
83
  }