@rsdk/core 4.0.0-next.7 → 4.0.0-next.8

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,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.0.0-next.8](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.7...v4.0.0-next.8) (2023-11-29)
7
+
8
+ ### Features
9
+
10
+ * Kafka batch producer ([#150](https://github.com/R-Vision/rsdk/issues/150)) ([2faa2f4](https://github.com/R-Vision/rsdk/commit/2faa2f41ca0dbb6d8a92cbf0ab20cf5cefeaf4e9))
11
+
6
12
  ## [4.0.0-next.7](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.6...v4.0.0-next.7) (2023-11-21)
7
13
 
8
14
  **Note:** Version bump only for package @rsdk/core
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ContextAggregator = void 0;
4
4
  const metadata_1 = require("@rsdk/metadata");
5
5
  const module_1 = require("./config/context/module");
6
+ const config_metadata_extractor_1 = require("./rsdk-metadata/config-metadata.extractor");
6
7
  const rsdk_metadata_global_module_1 = require("./rsdk-metadata/rsdk-metadata.global-module");
7
8
  const config_1 = require("./config");
8
9
  const platform_module_1 = require("./platform.module");
@@ -25,11 +26,8 @@ class ContextAggregator {
25
26
  return this._aggregated;
26
27
  }
27
28
  const platformRoot = platform_module_1.PlatformModule.forRoot(this.platformContext.extendedOptions);
28
- const rsdkMetadataGlobalModule = await rsdk_metadata_global_module_1.RsdkMetadataGlobalModule.raw(platformRoot);
29
- const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create([
30
- rsdkMetadataGlobalModule,
31
- platformRoot,
32
- ]);
29
+ const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create([platformRoot], { resource: [new config_metadata_extractor_1.ConfigMetadataExtractor()] });
30
+ const rsdkMetadataGlobalModule = await rsdk_metadata_global_module_1.RsdkMetadataGlobalModule.fromProvider(rsdkMetadataProvider);
33
31
  const configContext = new config_1.ConfigContext(rsdkMetadataProvider, {
34
32
  ...this.platformContext.options.config,
35
33
  appName: this.platformContext.extendedOptions.name,
@@ -1 +1 @@
1
- {"version":3,"file":"context.aggregator.js","sourceRoot":"","sources":["../src/context.aggregator.ts"],"names":[],"mappings":";;;AACA,6CAAsD;AAEtD,oDAA8D;AAC9D,6FAAuF;AAEvF,qCAAyC;AAEzC,uDAAmD;AAEnD,MAAa,iBAAiB;IAGR;IAFZ,WAAW,CAAqB;IAExC,YAAoB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAExD;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,MAAM,YAAY,GAAG,gCAAc,CAAC,OAAO,CACzC,IAAI,CAAC,eAAe,CAAC,eAAe,CACrC,CAAC;QACF,MAAM,wBAAwB,GAC5B,MAAM,sDAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,oBAAoB,GAAG,MAAM,+BAAoB,CAAC,MAAM,CAAC;YAC7D,wBAAwB;YACxB,YAAY;SACb,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,IAAI,sBAAa,CAAC,oBAAoB,EAAE;YAC5D,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM;YACtC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI;SACnD,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG;YACX,OAAO,EAAE;gBACP,YAAY;gBACZ,wBAAwB;gBACxB,4BAAmB,CAAC,OAAO,CAAC,aAAa,CAAC;aAC3C;YACD,MAAM,EAAE,iBAAiB;SAC1B,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,EAAE,IAAI,EAAE,oBAAoB,EAAE,aAAa,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB;QACpB,8DAA8D;QAC9D,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,OAAO,UAAU,CAAC,oBAAoB,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAhED,8CAgEC"}
1
+ {"version":3,"file":"context.aggregator.js","sourceRoot":"","sources":["../src/context.aggregator.ts"],"names":[],"mappings":";;;AACA,6CAAsD;AAEtD,oDAA8D;AAC9D,yFAAoF;AACpF,6FAAuF;AAEvF,qCAAyC;AAEzC,uDAAmD;AAEnD,MAAa,iBAAiB;IAGR;IAFZ,WAAW,CAAqB;IAExC,YAAoB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAExD;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,MAAM,YAAY,GAAG,gCAAc,CAAC,OAAO,CACzC,IAAI,CAAC,eAAe,CAAC,eAAe,CACrC,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,+BAAoB,CAAC,MAAM,CAC5D,CAAC,YAAY,CAAC,EACd,EAAE,QAAQ,EAAE,CAAC,IAAI,mDAAuB,EAAE,CAAC,EAAE,CAC9C,CAAC;QACF,MAAM,wBAAwB,GAC5B,MAAM,sDAAwB,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,IAAI,sBAAa,CAAC,oBAAoB,EAAE;YAC5D,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM;YACtC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI;SACnD,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG;YACX,OAAO,EAAE;gBACP,YAAY;gBACZ,wBAAwB;gBACxB,4BAAmB,CAAC,OAAO,CAAC,aAAa,CAAC;aAC3C;YACD,MAAM,EAAE,iBAAiB;SAC1B,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,EAAE,IAAI,EAAE,oBAAoB,EAAE,aAAa,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB;QACpB,8DAA8D;QAC9D,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,OAAO,UAAU,CAAC,oBAAoB,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAhED,8CAgEC"}
@@ -7,7 +7,7 @@ const heath_autodoc_resolver_1 = require("../autodoc/heath.autodoc-resolver");
7
7
  const constants_1 = require("./constants");
8
8
  class IndicatorsRegistry {
9
9
  static register(target, options) {
10
- metadata_1.RsdkMetadata.add(target, { target, options, constructorName: target.name }, constants_1.HEALTH_INDICATOR_RSDK_METADATA_SCOPE);
10
+ metadata_1.RsdkMetadata.setWithScope(target, constants_1.HEALTH_INDICATOR_RSDK_METADATA_SCOPE, target, { target, options, constructorName: target.name });
11
11
  autodoc_protocol_1.AutodocMetadata.defineResolver(target, constants_1.HEALTH_INDICATOR_RSDK_METADATA_SCOPE, heath_autodoc_resolver_1.indicatorAutodocResolver);
12
12
  }
13
13
  }
@@ -1 +1 @@
1
- {"version":3,"file":"indicators.registry.js","sourceRoot":"","sources":["../../../src/health/metadata/indicators.registry.ts"],"names":[],"mappings":";;;AAAA,6DAAyD;AAEzD,6CAA8C;AAE9C,8EAA6E;AAG7E,2CAAmE;AAGnE,MAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CACb,MAAoC,EACpC,OAA0B;QAE1B,uBAAY,CAAC,GAAG,CACd,MAAM,EACN,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,CAAC,IAAI,EAAE,EACjD,gDAAoC,CACrC,CAAC;QACF,kCAAe,CAAC,cAAc,CAC5B,MAAM,EACN,gDAAoC,EACpC,iDAAwB,CACzB,CAAC;IACJ,CAAC;CACF;AAhBD,gDAgBC"}
1
+ {"version":3,"file":"indicators.registry.js","sourceRoot":"","sources":["../../../src/health/metadata/indicators.registry.ts"],"names":[],"mappings":";;;AAAA,6DAAyD;AAEzD,6CAA8C;AAE9C,8EAA6E;AAG7E,2CAAmE;AAGnE,MAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CACb,MAAoC,EACpC,OAA0B;QAE1B,uBAAY,CAAC,YAAY,CACvB,MAAM,EACN,gDAAoC,EACpC,MAAM,EACN,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,CAAC,IAAI,EAAE,CAClD,CAAC;QACF,kCAAe,CAAC,cAAc,CAC5B,MAAM,EACN,gDAAoC,EACpC,iDAAwB,CACzB,CAAC;IACJ,CAAC;CACF;AAjBD,gDAiBC"}
@@ -19,8 +19,7 @@ const common_1 = require("@nestjs/common");
19
19
  const logging_1 = require("@rsdk/logging");
20
20
  const metadata_1 = require("@rsdk/metadata");
21
21
  const pino_1 = __importDefault(require("pino"));
22
- const constants_1 = require("../rsdk-metadata/constants");
23
- const constants_2 = require("./metadata/constants");
22
+ const constants_1 = require("./metadata/constants");
24
23
  const helpers_1 = require("./helpers");
25
24
  const logging_config_1 = require("./logging.config");
26
25
  let LoggingModule = class LoggingModule {
@@ -51,8 +50,8 @@ let LoggingModule = class LoggingModule {
51
50
  };
52
51
  }
53
52
  static register(target, context, token = (0, helpers_1.getLoggerToken)(context)) {
54
- metadata_1.RsdkMetadata.add(target, this.forFeature(context, token), constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE);
55
- metadata_1.RsdkMetadata.add(target, { context, token, target }, constants_2.LOGGING_RSDK_METADATA_SCOPE);
53
+ metadata_1.RsdkMetadata.add(target, this.forFeature(context, token), metadata_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE);
54
+ metadata_1.RsdkMetadata.add(target, { context, token, target }, constants_1.LOGGING_RSDK_METADATA_SCOPE);
56
55
  }
57
56
  /**
58
57
  * Дополнительная возможность добавить в DI контейнер логгер в случаях когда нужен инлайн вызов например через `useFactory`
@@ -1 +1 @@
1
- {"version":3,"file":"logging.module.js","sourceRoot":"","sources":["../../src/logging/logging.module.ts"],"names":[],"mappings":";AAAA,8BAA8B;;;;;;;;;;;;;;;;AAG9B,2CAAwC;AAExC,2CAA8C;AAC9C,6CAA8C;AAC9C,gDAAwB;AAGxB,0DAAgF;AAEhF,oDAAmE;AACnE,uCAA2C;AAC3C,qDAAiD;AAI1C,IAAM,aAAa,GAAnB,MAAM,aAAa;;IAChB,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAE9D,YAAY,MAAqB;QAC/B,MAAM,GAAG,GAAG,GAAS,EAAE;YACrB,eAAa,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,MAAM,CAAC,KAAK,GAAG,EAAE;gBAChE,QAAQ,EAAE,MAAM,CAAC,KAAK;aACvB,CAAC,CAAC;YAEH,uBAAa,CAAC,WAAW,CAAC;gBACxB,GAAG,MAAM;gBACT,MAAM,EAAE,cAAI,CAAC,WAAW,CAAC;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CAAC;aACH,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrB,GAAG,EAAE,CAAC;IACR,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,eAAa;SACtB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CACb,MAAc,EACd,OAA6B,EAC7B,KAAK,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC;QAE/B,uBAAY,CAAC,GAAG,CACd,MAAM,EACN,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,EAC/B,8CAAkC,CACnC,CAAC;QAEF,uBAAY,CAAC,GAAG,CACd,MAAM,EACN,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAC1B,uCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,MAAM,CAAC,UAAU,CACf,OAA6B,EAC7B,KAAK,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC;QAE/B,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,eAAa;YACrB,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,uBAAa,CAAC,MAAM,CAAC,OAAO,CAAC;iBACxC;aACF;YACD,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB,CAAC;IACJ,CAAC;;AA7FU,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;qCAIW,8BAAa;GAHtB,aAAa,CA8FzB"}
1
+ {"version":3,"file":"logging.module.js","sourceRoot":"","sources":["../../src/logging/logging.module.ts"],"names":[],"mappings":";AAAA,8BAA8B;;;;;;;;;;;;;;;;AAG9B,2CAAwC;AAExC,2CAA8C;AAE9C,6CAGwB;AACxB,gDAAwB;AAExB,oDAAmE;AACnE,uCAA2C;AAC3C,qDAAiD;AAI1C,IAAM,aAAa,GAAnB,MAAM,aAAa;;IAChB,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAE9D,YAAY,MAAqB;QAC/B,MAAM,GAAG,GAAG,GAAS,EAAE;YACrB,eAAa,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,MAAM,CAAC,KAAK,GAAG,EAAE;gBAChE,QAAQ,EAAE,MAAM,CAAC,KAAK;aACvB,CAAC,CAAC;YAEH,uBAAa,CAAC,WAAW,CAAC;gBACxB,GAAG,MAAM;gBACT,MAAM,EAAE,cAAI,CAAC,WAAW,CAAC;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CAAC;aACH,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrB,GAAG,EAAE,CAAC;IACR,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,eAAa;SACtB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CACb,MAAc,EACd,OAA6B,EAC7B,KAAK,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC;QAE/B,uBAAY,CAAC,GAAG,CACd,MAAM,EACN,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,EAC/B,6CAAkC,CACnC,CAAC;QAEF,uBAAY,CAAC,GAAG,CACd,MAAM,EACN,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAC1B,uCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,MAAM,CAAC,UAAU,CACf,OAA6B,EAC7B,KAAK,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC;QAE/B,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,eAAa;YACrB,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,uBAAa,CAAC,MAAM,CAAC,OAAO,CAAC;iBACxC;aACF;YACD,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB,CAAC;IACJ,CAAC;;AA7FU,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;qCAIW,8BAAa;GAHtB,aAAa,CA8FzB"}
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ConfigMetadataExtractor = void 0;
4
+ const metadata_1 = require("@rsdk/metadata");
4
5
  const nest_tools_1 = require("@rsdk/nest-tools");
5
6
  const config_1 = require("../config");
6
- const constants_1 = require("./constants");
7
7
  /**
8
8
  * @private
9
9
  */
@@ -34,7 +34,7 @@ class ConfigMetadataExtractor {
34
34
  resources.push({
35
35
  value: config_1.PlatformConfigModule.createConfigProvider(arg),
36
36
  key: arg,
37
- scope: constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
37
+ scope: metadata_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
38
38
  });
39
39
  }
40
40
  return resources;
@@ -1 +1 @@
1
- {"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;AASA,iDAA0D;AAE1D,sCAAyD;AAEzD,2CAAiE;AAEjE;;GAEG;AACH,MAAa,uBAAuB;IAClC,OAAO,CACL,KAMkB;QAElB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,EAAE,CAAC;SACX;QACD;;WAEG;QACH,MAAM,IAAI,GAAG,2BAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC/C;;WAEG;QACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,SAAS,GAA8B,EAAE,CAAC;QAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAC/B,SAAS;aACV;YACD,MAAM,eAAe,GAAG,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAEpD,IAAI,CAAC,eAAe,EAAE;gBACpB,SAAS;aACV;YACD,SAAS,CAAC,IAAI,CAAC;gBACb,KAAK,EAAE,6BAAoB,CAAC,oBAAoB,CAAC,GAAG,CAAC;gBACrD,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,8CAAkC;aAC1C,CAAC,CAAC;SACJ;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1CD,0DA0CC"}
1
+ {"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;AASA,6CAAoE;AACpE,iDAA0D;AAE1D,sCAAyD;AAEzD;;GAEG;AACH,MAAa,uBAAuB;IAClC,OAAO,CACL,KAMkB;QAElB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,EAAE,CAAC;SACX;QACD;;WAEG;QACH,MAAM,IAAI,GAAG,2BAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC/C;;WAEG;QACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,SAAS,GAA8B,EAAE,CAAC;QAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAC/B,SAAS;aACV;YACD,MAAM,eAAe,GAAG,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAEpD,IAAI,CAAC,eAAe,EAAE;gBACpB,SAAS;aACV;YACD,SAAS,CAAC,IAAI,CAAC;gBACb,KAAK,EAAE,6BAAoB,CAAC,oBAAoB,CAAC,GAAG,CAAC;gBACrD,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,6CAAkC;aAC1C,CAAC,CAAC;SACJ;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1CD,0DA0CC"}
@@ -1,6 +1,6 @@
1
1
  import type { DynamicModule } from '@nestjs/common';
2
- import type { NestModuleDefinition } from '@rsdk/nest-tools/dist/nest-definition';
2
+ import { RsdkMetadataProvider } from '@rsdk/metadata';
3
3
  export declare class RsdkMetadataGlobalModule {
4
4
  static logger: import("@rsdk/logging").ILogger;
5
- static raw(rootModule: NestModuleDefinition): Promise<DynamicModule>;
5
+ static fromProvider(rsdkMetadataProvider: RsdkMetadataProvider): Promise<DynamicModule>;
6
6
  }
@@ -3,13 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.RsdkMetadataGlobalModule = void 0;
4
4
  const logging_1 = require("@rsdk/logging");
5
5
  const metadata_1 = require("@rsdk/metadata");
6
- const config_metadata_extractor_1 = require("./config-metadata.extractor");
7
- const constants_1 = require("./constants");
8
6
  class RsdkMetadataGlobalModule {
9
7
  static logger = logging_1.LoggerFactory.create(RsdkMetadataGlobalModule);
10
- static async raw(rootModule) {
11
- const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create([rootModule], [new config_metadata_extractor_1.ConfigMetadataExtractor()]);
12
- const resources = rsdkMetadataProvider.get(constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE);
8
+ static async fromProvider(rsdkMetadataProvider) {
9
+ const resources = rsdkMetadataProvider.get(metadata_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE);
13
10
  const imports = resources.map(({ value }) => value);
14
11
  RsdkMetadataGlobalModule.logger.trace('extracted imports: ', {
15
12
  imports,
@@ -1 +1 @@
1
- {"version":3,"file":"rsdk-metadata.global-module.js","sourceRoot":"","sources":["../../src/rsdk-metadata/rsdk-metadata.global-module.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAC9C,6CAAsD;AAGtD,2EAAsE;AAEtE,2CAAiE;AAEjE,MAAa,wBAAwB;IACnC,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAE/D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAgC;QAC/C,MAAM,oBAAoB,GAAG,MAAM,+BAAoB,CAAC,MAAM,CAC5D,CAAC,UAAU,CAAC,EACZ,CAAC,IAAI,mDAAuB,EAAE,CAAC,CAChC,CAAC;QAEF,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CACxC,8CAAkC,CACnC,CAAC;QACF,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAEpD,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE;YAC3D,OAAO;SACR,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,OAAO;YACP,MAAM,EAAE,wBAAwB;YAChC,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,+BAAoB;oBAC7B,QAAQ,EAAE,oBAAoB;iBAC/B;aACF;YACD,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,+BAAoB,CAAC;SAC5C,CAAC;IACJ,CAAC;;AA7BH,4DA8BC"}
1
+ {"version":3,"file":"rsdk-metadata.global-module.js","sourceRoot":"","sources":["../../src/rsdk-metadata/rsdk-metadata.global-module.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C,6CAGwB;AAExB,MAAa,wBAAwB;IACnC,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAE/D,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,oBAA0C;QAE1C,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CACxC,6CAAkC,CACnC,CAAC;QACF,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAEpD,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE;YAC3D,OAAO;SACR,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,OAAO;YACP,MAAM,EAAE,wBAAwB;YAChC,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,+BAAoB;oBAC7B,QAAQ,EAAE,oBAAoB;iBAC/B;aACF;YACD,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,+BAAoB,CAAC;SAC5C,CAAC;IACJ,CAAC;;AA1BH,4DA2BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/core",
3
- "version": "4.0.0-next.7",
3
+ "version": "4.0.0-next.8",
4
4
  "description": "Nestjs based microservice chassis",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -31,18 +31,18 @@
31
31
  "@nestjs/common": "^10.0.0",
32
32
  "@nestjs/core": "^10.0.0",
33
33
  "@nestjs/microservices": "^10.0.0",
34
- "@rsdk/autodoc.protocol": "^4.0.0-next.6",
34
+ "@rsdk/autodoc.protocol": "^4.0.0-next.8",
35
35
  "@rsdk/common": "^4.0.0-next.6",
36
36
  "@rsdk/common.nestjs": "^4.0.0-next.6",
37
- "@rsdk/common.node": "^4.0.0-next.2",
37
+ "@rsdk/common.node": "^4.0.0-next.8",
38
38
  "@rsdk/decorators": "^4.0.0-next.6",
39
39
  "@rsdk/logging": "^4.0.0-next.6",
40
- "@rsdk/metadata": "^4.0.0-next.6",
40
+ "@rsdk/metadata": "^4.0.0-next.8",
41
41
  "@rsdk/nest-tools": "^4.0.0-next.4",
42
42
  "axios": "^1.1.3",
43
43
  "pino": "^8.16.1",
44
44
  "reflect-metadata": "^0.1.13",
45
45
  "rxjs": "^7.0.0"
46
46
  },
47
- "gitHead": "4f7a62a868e74386adb9f3d879e97eed04291e11"
47
+ "gitHead": "bae7c74fc8be068b8bd66b403d19e2b32cf092ec"
48
48
  }
@@ -2,6 +2,7 @@ import type { DynamicModule } from '@nestjs/common';
2
2
  import { RsdkMetadataProvider } from '@rsdk/metadata';
3
3
 
4
4
  import { ConfigContextModule } from './config/context/module';
5
+ import { ConfigMetadataExtractor } from './rsdk-metadata/config-metadata.extractor';
5
6
  import { RsdkMetadataGlobalModule } from './rsdk-metadata/rsdk-metadata.global-module';
6
7
  import type { ContextAggregated } from './types/context-aggregated';
7
8
  import { ConfigContext } from './config';
@@ -28,12 +29,12 @@ export class ContextAggregator {
28
29
  const platformRoot = PlatformModule.forRoot(
29
30
  this.platformContext.extendedOptions,
30
31
  );
32
+ const rsdkMetadataProvider = await RsdkMetadataProvider.create(
33
+ [platformRoot],
34
+ { resource: [new ConfigMetadataExtractor()] },
35
+ );
31
36
  const rsdkMetadataGlobalModule =
32
- await RsdkMetadataGlobalModule.raw(platformRoot);
33
- const rsdkMetadataProvider = await RsdkMetadataProvider.create([
34
- rsdkMetadataGlobalModule,
35
- platformRoot,
36
- ]);
37
+ await RsdkMetadataGlobalModule.fromProvider(rsdkMetadataProvider);
37
38
 
38
39
  const configContext = new ConfigContext(rsdkMetadataProvider, {
39
40
  ...this.platformContext.options.config,
@@ -13,10 +13,11 @@ export class IndicatorsRegistry {
13
13
  target: Constructor<HealthIndicator>,
14
14
  options: IndicatorMetadata,
15
15
  ): void {
16
- RsdkMetadata.add<HealthIndicatorRsdkMetadata>(
16
+ RsdkMetadata.setWithScope<HealthIndicatorRsdkMetadata>(
17
17
  target,
18
- { target, options, constructorName: target.name },
19
18
  HEALTH_INDICATOR_RSDK_METADATA_SCOPE,
19
+ target,
20
+ { target, options, constructorName: target.name },
20
21
  );
21
22
  AutodocMetadata.defineResolver(
22
23
  target,
@@ -4,12 +4,13 @@ import type { DynamicModule } from '@nestjs/common';
4
4
  import { Module } from '@nestjs/common';
5
5
  import type { Constructor } from '@rsdk/common';
6
6
  import { LoggerFactory } from '@rsdk/logging';
7
- import { RsdkMetadata } from '@rsdk/metadata';
7
+ import type { PlatformRawGlobalMetadata } from '@rsdk/metadata';
8
+ import {
9
+ PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
10
+ RsdkMetadata,
11
+ } from '@rsdk/metadata';
8
12
  import pino from 'pino';
9
13
 
10
- import type { PlatformRawGlobalMetadata } from '../rsdk-metadata/constants';
11
- import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from '../rsdk-metadata/constants';
12
-
13
14
  import { LOGGING_RSDK_METADATA_SCOPE } from './metadata/constants';
14
15
  import { getLoggerToken } from './helpers';
15
16
  import { LoggingConfig } from './logging.config';
@@ -7,12 +7,11 @@ import type {
7
7
  ValueProvider,
8
8
  } from '@nestjs/common';
9
9
  import type { Resource, ResourceExtractor } from '@rsdk/metadata';
10
+ import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from '@rsdk/metadata';
10
11
  import { Assert, NestDefinition } from '@rsdk/nest-tools';
11
12
 
12
13
  import { Config, PlatformConfigModule } from '../config';
13
14
 
14
- import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from './constants';
15
-
16
15
  /**
17
16
  * @private
18
17
  */
@@ -1,21 +1,17 @@
1
1
  import type { DynamicModule } from '@nestjs/common';
2
2
  import { LoggerFactory } from '@rsdk/logging';
3
- import { RsdkMetadataProvider } from '@rsdk/metadata';
4
- import type { NestModuleDefinition } from '@rsdk/nest-tools/dist/nest-definition';
5
-
6
- import { ConfigMetadataExtractor } from './config-metadata.extractor';
7
- import type { PlatformRawGlobalMetadata } from './constants';
8
- import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from './constants';
3
+ import type { PlatformRawGlobalMetadata } from '@rsdk/metadata';
4
+ import {
5
+ PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
6
+ RsdkMetadataProvider,
7
+ } from '@rsdk/metadata';
9
8
 
10
9
  export class RsdkMetadataGlobalModule {
11
10
  static logger = LoggerFactory.create(RsdkMetadataGlobalModule);
12
11
 
13
- static async raw(rootModule: NestModuleDefinition): Promise<DynamicModule> {
14
- const rsdkMetadataProvider = await RsdkMetadataProvider.create(
15
- [rootModule],
16
- [new ConfigMetadataExtractor()],
17
- );
18
-
12
+ static async fromProvider(
13
+ rsdkMetadataProvider: RsdkMetadataProvider,
14
+ ): Promise<DynamicModule> {
19
15
  const resources = rsdkMetadataProvider.get<PlatformRawGlobalMetadata>(
20
16
  PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
21
17
  );
@@ -1,3 +0,0 @@
1
- import type { NestModuleDefinition } from '@rsdk/common.nestjs';
2
- export declare const PLATFORM_RAW_GLOBAL_METADATA_SCOPE = "PLATFORM_RAW_GLOBAL_RSDK_METADATA_SCOPE";
3
- export type PlatformRawGlobalMetadata = NestModuleDefinition;
@@ -1,5 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.PLATFORM_RAW_GLOBAL_METADATA_SCOPE = void 0;
4
- exports.PLATFORM_RAW_GLOBAL_METADATA_SCOPE = 'PLATFORM_RAW_GLOBAL_RSDK_METADATA_SCOPE';
5
- //# sourceMappingURL=constants.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/rsdk-metadata/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,kCAAkC,GAC7C,yCAAyC,CAAC"}
@@ -1,6 +0,0 @@
1
- import type { NestModuleDefinition } from '@rsdk/common.nestjs';
2
-
3
- export const PLATFORM_RAW_GLOBAL_METADATA_SCOPE =
4
- 'PLATFORM_RAW_GLOBAL_RSDK_METADATA_SCOPE';
5
-
6
- export type PlatformRawGlobalMetadata = NestModuleDefinition;