@rsdk/core 3.1.0-next.1 → 3.1.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.0](https://github.com/R-Vision/rsdk/compare/v3.1.0-next.3...v3.1.0) (2023-08-09)
+
+**Note:** Version bump only for package @rsdk/core
+
+## [3.1.0-next.2](https://github.com/R-Vision/rsdk/compare/v3.1.0-next.1...v3.1.0-next.2) (2023-08-08)
+
+### Features
+
+* config section without requirements `.forFeature(ctor)` ([#95](https://github.com/R-Vision/rsdk/issues/95)) ([0dfa194](https://github.com/R-Vision/rsdk/commit/0dfa1949cd48d98d784b61c21fa9d05048252734))
+
 ## [3.1.0-next.1](https://github.com/R-Vision/rsdk/compare/v3.1.0-next.0...v3.1.0-next.1) (2023-08-08)
 
 ### Features

package/dist/context.aggregator.js

@@ -26,7 +26,10 @@ class ContextAggregator {
         }
         const platformRoot = platform_module_1.PlatformModule.forRoot(this.platformContext.extendedOptions);
         const rsdkMetadataGlobalModule = await rsdk_metadata_global_module_1.RsdkMetadataGlobalModule.raw(platformRoot);
-        const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create(rsdkMetadataGlobalModule, platformRoot);
+        const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create([
+            rsdkMetadataGlobalModule,
+            platformRoot,
+        ]);
         const configContext = new config_1.ConfigContext(rsdkMetadataProvider, {
             ...this.platformContext.options.config,
             appName: this.platformContext.extendedOptions.name,

package/dist/context.aggregator.js.map

@@ -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,GAAG,MAAM,sDAAwB,CAAC,GAAG,CACjE,YAAY,CACb,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,+BAAoB,CAAC,MAAM,CAC5D,wBAAwB,EACxB,YAAY,CACb,CAAC;QAEF,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;AAjED,8CAiEC"}
+{"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,GAAG,MAAM,sDAAwB,CAAC,GAAG,CACjE,YAAY,CACb,CAAC;QACF,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;AAjED,8CAiEC"}

package/dist/rsdk-metadata/config-metadata.extractor.d.ts

@@ -0,0 +1,8 @@
+import type { ClassProvider, DynamicModule, ExistingProvider, FactoryProvider, InjectionToken, ValueProvider } from '@nestjs/common';
+import type { Resource, ResourceExtractor } from '@rsdk/metadata';
+/**
+ * @private
+ */
+export declare class ConfigMetadataExtractor implements ResourceExtractor {
+    extract(value: DynamicModule | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | InjectionToken): Resource<unknown>[];
+}

package/dist/rsdk-metadata/config-metadata.extractor.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigMetadataExtractor = void 0;
+const config_1 = require("../config");
+const constants_1 = require("./constants");
+/**
+ * @private
+ */
+class ConfigMetadataExtractor {
+    extract(value) {
+        /**
+         * Получаем аргументы конструктора
+         */
+        const args = Reflect.getMetadata('design:paramtypes', value);
+        /**
+         * Если их нет, просто возвращаем пустой массив
+         */
+        if (!Array.isArray(args)) {
+            return [];
+        }
+        const resources = [];
+        for (const arg of args) {
+            const isConfigSection = Reflect.getMetadata(config_1.CONFIG_METADATA_KEY, arg) &&
+                arg.prototype instanceof config_1.Config;
+            if (!isConfigSection) {
+                continue;
+            }
+            resources.push({
+                value: config_1.PlatformConfigModule.forFeature(arg),
+                key: arg,
+                scope: constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+            });
+        }
+        return resources;
+    }
+}
+exports.ConfigMetadataExtractor = ConfigMetadataExtractor;
+//# sourceMappingURL=config-metadata.extractor.js.map

package/dist/rsdk-metadata/config-metadata.extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;AAUA,sCAA8E;AAE9E,2CAAiE;AAEjE;;GAEG;AACH,MAAa,uBAAuB;IAClC,OAAO,CACL,KAMkB;QAElB;;WAEG;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAC7D;;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,MAAM,eAAe,GACnB,OAAO,CAAC,WAAW,CAAC,4BAAmB,EAAE,GAAG,CAAC;gBAC7C,GAAG,CAAC,SAAS,YAAY,eAAM,CAAC;YAElC,IAAI,CAAC,eAAe,EAAE;gBACpB,SAAS;aACV;YACD,SAAS,CAAC,IAAI,CAAC;gBACb,KAAK,EAAE,6BAAoB,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC3C,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,8CAAkC;aAC1C,CAAC,CAAC;SACJ;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAtCD,0DAsCC"}

package/dist/rsdk-metadata/rsdk-metadata.global-module.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RsdkMetadataGlobalModule = void 0;
 const logging_1 = require("@rsdk/logging");
 const metadata_1 = require("@rsdk/metadata");
+const config_metadata_extractor_1 = require("./config-metadata.extractor");
 const constants_1 = require("./constants");
 class RsdkMetadataGlobalModule {
     static logger = logging_1.LoggerFactory.create(RsdkMetadataGlobalModule);
     static async raw(rootModule) {
-        const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create(rootModule);
+        const rsdkMetadataProvider = await metadata_1.RsdkMetadataProvider.create([rootModule], [new config_metadata_extractor_1.ConfigMetadataExtractor()]);
         const resources = rsdkMetadataProvider.get(constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE);
         const imports = resources.map(({ value }) => value);
         RsdkMetadataGlobalModule.logger.trace('extracted imports: ', {

package/dist/rsdk-metadata/rsdk-metadata.global-module.js.map

@@ -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;AAItD,2CAAiE;AAEjE,MAAa,wBAAwB;IACnC,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC/D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAgC;QAC/C,MAAM,oBAAoB,GAAG,MAAM,+BAAoB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3E,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;;AAxBH,4DAyBC"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "3.1.0-next.1",
+  "version": "3.1.0",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -31,17 +31,17 @@
     "@nestjs/common": "^10.1.3",
     "@nestjs/core": "^10.1.3",
     "@nestjs/microservices": "^10.1.3",
-    "@rsdk/autodoc.protocol": "^3.1.0-next.0",
-    "@rsdk/common": "^3.1.0-next.0",
-    "@rsdk/common.nestjs": "^3.1.0-next.0",
-    "@rsdk/common.node": "^3.1.0-next.0",
-    "@rsdk/decorators": "^3.1.0-next.0",
-    "@rsdk/logging": "^3.1.0-next.0",
-    "@rsdk/metadata": "^3.1.0-next.0",
-    "@rsdk/nest-tools": "^3.1.0-next.0",
+    "@rsdk/autodoc.protocol": "^3.1.0",
+    "@rsdk/common": "^3.1.0",
+    "@rsdk/common.nestjs": "^3.1.0",
+    "@rsdk/common.node": "^3.1.0",
+    "@rsdk/decorators": "^3.1.0",
+    "@rsdk/logging": "^3.1.0",
+    "@rsdk/metadata": "^3.1.0",
+    "@rsdk/nest-tools": "^3.1.0",
     "axios": "^1.1.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "e9002b175fb3d24b9bae5169df59bd250091672c"
+  "gitHead": "428640441ec53822ea1c1be7b085bb9dad04689d"
 }

package/src/context.aggregator.ts

@@ -31,10 +31,10 @@ export class ContextAggregator {
     const rsdkMetadataGlobalModule = await RsdkMetadataGlobalModule.raw(
       platformRoot,
     );
-    const rsdkMetadataProvider = await RsdkMetadataProvider.create(
+    const rsdkMetadataProvider = await RsdkMetadataProvider.create([
       rsdkMetadataGlobalModule,
       platformRoot,
-    );
+    ]);
 
     const configContext = new ConfigContext(rsdkMetadataProvider, {
       ...this.platformContext.options.config,

package/src/rsdk-metadata/config-metadata.extractor.ts

@@ -0,0 +1,56 @@
+import type {
+  ClassProvider,
+  DynamicModule,
+  ExistingProvider,
+  FactoryProvider,
+  InjectionToken,
+  ValueProvider,
+} from '@nestjs/common';
+import type { Resource, ResourceExtractor } from '@rsdk/metadata';
+
+import { Config, CONFIG_METADATA_KEY, PlatformConfigModule } from '../config';
+
+import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from './constants';
+
+/**
+ * @private
+ */
+export class ConfigMetadataExtractor implements ResourceExtractor {
+  extract(
+    value:
+      | DynamicModule
+      | ClassProvider<any>
+      | ValueProvider<any>
+      | FactoryProvider<any>
+      | ExistingProvider<any>
+      | InjectionToken,
+  ): Resource<unknown>[] {
+    /**
+     * Получаем аргументы конструктора
+     */
+    const args = Reflect.getMetadata('design:paramtypes', value);
+    /**
+     * Если их нет, просто возвращаем пустой массив
+     */
+    if (!Array.isArray(args)) {
+      return [];
+    }
+    const resources: Resource<DynamicModule>[] = [];
+
+    for (const arg of args) {
+      const isConfigSection =
+        Reflect.getMetadata(CONFIG_METADATA_KEY, arg) &&
+        arg.prototype instanceof Config;
+
+      if (!isConfigSection) {
+        continue;
+      }
+      resources.push({
+        value: PlatformConfigModule.forFeature(arg),
+        key: arg,
+        scope: PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+      });
+    }
+    return resources;
+  }
+}

package/src/rsdk-metadata/rsdk-metadata.global-module.ts

@@ -3,13 +3,19 @@ import { LoggerFactory } from '@rsdk/logging';
 import { RsdkMetadataProvider } from '@rsdk/metadata';
 import type { NestModuleDefinition } from '@rsdk/nest-tools/dist/nest-definition';
 
+import { ConfigMetadataExtractor } from './config-metadata.extractor';
 import type { PlatformRawGlobalMetadata } from './constants';
 import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from './constants';
 
 export class RsdkMetadataGlobalModule {
   static logger = LoggerFactory.create(RsdkMetadataGlobalModule);
+
   static async raw(rootModule: NestModuleDefinition): Promise<DynamicModule> {
-    const rsdkMetadataProvider = await RsdkMetadataProvider.create(rootModule);
+    const rsdkMetadataProvider = await RsdkMetadataProvider.create(
+      [rootModule],
+      [new ConfigMetadataExtractor()],
+    );
+
     const resources = rsdkMetadataProvider.get<PlatformRawGlobalMetadata>(
       PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
     );