@rsdk/kafka.producer 4.2.2-next.0 → 4.2.2-next.1

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 (5) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/events-factory.abstract.js +11 -5
  3. package/dist/events-factory.abstract.js.map +1 -1
  4. package/package.json +6 -6
  5. package/src/events-factory.abstract.ts +7 -2
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
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
+ ## [4.2.2-next.1](https://github.com/R-Vision/rsdk/compare/v4.2.2-next.0...v4.2.2-next.1) (2024-02-07)
7
+
8
+ ### Bug Fixes
9
+
10
+ * added partitionKeyField camelCase interpolation ([#208](https://github.com/R-Vision/rsdk/issues/208)) ([71b6e90](https://github.com/R-Vision/rsdk/commit/71b6e9049d2bd7e8169ae09f76f4ad274f892f24))
11
+
6
12
  ## [4.2.2-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.1...v4.2.2-next.0) (2024-02-07)
7
13
 
8
14
  **Note:** Version bump only for package @rsdk/kafka.producer
package/dist/events-factory.abstract.js CHANGED
@@ -1,8 +1,12 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.EventsFactory = void 0;
4
7
  const kafka_common_1 = require("@rsdk/kafka.common");
5
- const lodash_1 = require("lodash");
8
+ const camelCase_1 = __importDefault(require("lodash/camelCase"));
9
+ const get_1 = __importDefault(require("lodash/get"));
6
10
  const node_crypto_1 = require("node:crypto");
7
11
  /**
8
12
  * Абстрактный класс, содержащий полезные методы для подготовки
@@ -46,16 +50,18 @@ class EventsFactory {
46
50
  const { $partitionKeyField } = this.eventType;
47
51
  if ($partitionKeyField && typeof $partitionKeyField === 'string') {
48
52
  // TODO: Может быть лучше ошибку кидать?
49
- return (0, lodash_1.get)(payload, $partitionKeyField) ?? (0, node_crypto_1.randomUUID)();
53
+ return ((0, get_1.default)(payload, $partitionKeyField) ??
54
+ (0, get_1.default)(payload, (0, camelCase_1.default)($partitionKeyField)) ??
55
+ (0, node_crypto_1.randomUUID)());
50
56
  }
51
57
  /**
52
58
  * Ищем последовательно поля id, uuid, guid,
53
59
  * если ничего не найдено, используем генерируем
54
60
  * ключ случайным образом
55
61
  */
56
- return ((0, lodash_1.get)(payload, 'id') ??
57
- (0, lodash_1.get)(payload, 'uuid') ??
58
- (0, lodash_1.get)(payload, 'guid') ??
62
+ return ((0, get_1.default)(payload, 'id') ??
63
+ (0, get_1.default)(payload, 'uuid') ??
64
+ (0, get_1.default)(payload, 'guid') ??
59
65
  (0, node_crypto_1.randomUUID)());
60
66
  }
61
67
  }
package/dist/events-factory.abstract.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"events-factory.abstract.js","sourceRoot":"","sources":["../src/events-factory.abstract.ts"],"names":[],"mappings":";;;AACA,qDAM4B;AAC5B,mCAA6B;AAC7B,6CAAyC;AAQzC;;;;GAIG;AACH,MAAsB,aAAa;IAIZ;IAHJ,aAAa,CAAgB;IAE9C,YACqB,SAAY,EAC/B,MAAuB;QADJ,cAAS,GAAT,SAAS,CAAG;QAG/B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,qCAAsB,CAAC;IACtE,CAAC;IAES,WAAW,CACnB,QAA0C;QAE1C,OAAO;YACL,GAAG,QAAQ;YACX,GAAG,CAAC,IAAI,CAAC,aAAa;gBACpB,IAAI,CAAC,aAAa,KAAK,qCAAsB,IAAI;gBAC/C,CAAC,8BAAe,CAAC,EAAE,IAAI,CAAC,aAAa;aACtC,CAAC;SACL,CAAC;IACJ,CAAC;IAES,gBAAgB,CAA4B,OAAU;QAC9D,MAAM,KAAK,GACT,IAAI,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI;YACvC,CAAC,CAAC,IAAI,6BAAc,EAAK;YACzB,CAAC,CAAC,IAAI,8BAAe,CAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAE7C,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAES,eAAe,CACvB,OAAU,EACV,OAAwB;QAExB;;;WAGG;QACH,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;QAED;;;WAGG;QACH,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9C,IAAI,kBAAkB,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YACjE,wCAAwC;YACxC,OAAO,IAAA,YAAG,EAAC,OAAO,EAAE,kBAAkB,CAAC,IAAI,IAAA,wBAAU,GAAE,CAAC;QAC1D,CAAC;QAED;;;;WAIG;QACH,OAAO,CACL,IAAA,YAAG,EAAC,OAAO,EAAE,IAAI,CAAC;YAClB,IAAA,YAAG,EAAC,OAAO,EAAE,MAAM,CAAC;YACpB,IAAA,YAAG,EAAC,OAAO,EAAE,MAAM,CAAC;YACpB,IAAA,wBAAU,GAAE,CACb,CAAC;IACJ,CAAC;CAGF;AAnED,sCAmEC"}
1
+ {"version":3,"file":"events-factory.abstract.js","sourceRoot":"","sources":["../src/events-factory.abstract.ts"],"names":[],"mappings":";;;;;;AACA,qDAM4B;AAC5B,iEAAyC;AACzC,qDAA6B;AAC7B,6CAAyC;AAQzC;;;;GAIG;AACH,MAAsB,aAAa;IAIZ;IAHJ,aAAa,CAAgB;IAE9C,YACqB,SAAY,EAC/B,MAAuB;QADJ,cAAS,GAAT,SAAS,CAAG;QAG/B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,qCAAsB,CAAC;IACtE,CAAC;IAES,WAAW,CACnB,QAA0C;QAE1C,OAAO;YACL,GAAG,QAAQ;YACX,GAAG,CAAC,IAAI,CAAC,aAAa;gBACpB,IAAI,CAAC,aAAa,KAAK,qCAAsB,IAAI;gBAC/C,CAAC,8BAAe,CAAC,EAAE,IAAI,CAAC,aAAa;aACtC,CAAC;SACL,CAAC;IACJ,CAAC;IAES,gBAAgB,CAA4B,OAAU;QAC9D,MAAM,KAAK,GACT,IAAI,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI;YACvC,CAAC,CAAC,IAAI,6BAAc,EAAK;YACzB,CAAC,CAAC,IAAI,8BAAe,CAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAE7C,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAES,eAAe,CACvB,OAAU,EACV,OAAwB;QAExB;;;WAGG;QACH,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;QAED;;;WAGG;QACH,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9C,IAAI,kBAAkB,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YACjE,wCAAwC;YACxC,OAAO,CACL,IAAA,aAAG,EAAC,OAAO,EAAE,kBAAkB,CAAC;gBAChC,IAAA,aAAG,EAAC,OAAO,EAAE,IAAA,mBAAS,EAAC,kBAAkB,CAAC,CAAC;gBAC3C,IAAA,wBAAU,GAAE,CACb,CAAC;QACJ,CAAC;QAED;;;;WAIG;QACH,OAAO,CACL,IAAA,aAAG,EAAC,OAAO,EAAE,IAAI,CAAC;YAClB,IAAA,aAAG,EAAC,OAAO,EAAE,MAAM,CAAC;YACpB,IAAA,aAAG,EAAC,OAAO,EAAE,MAAM,CAAC;YACpB,IAAA,wBAAU,GAAE,CACb,CAAC;IACJ,CAAC;CAGF;AAvED,sCAuEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/kafka.producer",
3
- "version": "4.2.2-next.0",
3
+ "version": "4.2.2-next.1",
4
4
  "description": "Publishers for kafka (different direct and outbox strategies)",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -14,13 +14,13 @@
14
14
  "@nestjs/common": "^10.0.0",
15
15
  "@nestjs/core": "^10.0.0",
16
16
  "@nestjs/microservices": "^10.0.0",
17
- "@rsdk/common": "^4.2.2-next.0",
18
- "@rsdk/core": "^4.2.2-next.0",
19
- "@rsdk/kafka.common": "^4.2.2-next.0",
20
- "@rsdk/logging": "^4.2.2-next.0",
17
+ "@rsdk/common": "^4.2.2-next.1",
18
+ "@rsdk/core": "^4.2.2-next.1",
19
+ "@rsdk/kafka.common": "^4.2.2-next.1",
20
+ "@rsdk/logging": "^4.2.2-next.1",
21
21
  "lodash": "^4.17.21",
22
22
  "reflect-metadata": "^0.1.13",
23
23
  "rxjs": "^7.0.0"
24
24
  },
25
- "gitHead": "62a6e9fbea39a9a849eae69edd41cbd54478e2ec"
25
+ "gitHead": "451f2fb76548553dddd62fae15725cc8b7b78dab"
26
26
  }
package/src/events-factory.abstract.ts CHANGED
@@ -6,7 +6,8 @@ import {
6
6
  ProtoEventCodec,
7
7
  X_FORMAT_HEADER,
8
8
  } from '@rsdk/kafka.common';
9
- import { get } from 'lodash';
9
+ import camelCase from 'lodash/camelCase';
10
+ import get from 'lodash/get';
10
11
  import { randomUUID } from 'node:crypto';
11
12
 
12
13
  import type {
@@ -70,7 +71,11 @@ export abstract class EventsFactory<T extends EventType, K extends object> {
70
71
  const { $partitionKeyField } = this.eventType;
71
72
  if ($partitionKeyField && typeof $partitionKeyField === 'string') {
72
73
  // TODO: Может быть лучше ошибку кидать?
73
- return get(payload, $partitionKeyField) ?? randomUUID();
74
+ return (
75
+ get(payload, $partitionKeyField) ??
76
+ get(payload, camelCase($partitionKeyField)) ??
77
+ randomUUID()
78
+ );
74
79
  }
75
80
 
76
81
  /**