@rsdk/core 5.2.1-next.2 → 5.3.0-next.1

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.
 
+## [5.3.0-next.1](https://github.com/R-Vision/rsdk/compare/v5.3.0-next.0...v5.3.0-next.1) (2024-10-29)
+
+### Features
+
+* detect useExisting on configs ([#277](https://github.com/R-Vision/rsdk/issues/277)) ([9c6f1b3](https://github.com/R-Vision/rsdk/commit/9c6f1b3e6e948a7c7004e7caa81494577ed4519e))
+
+## [5.3.0-next.0](https://github.com/R-Vision/rsdk/compare/v5.2.1-next.2...v5.3.0-next.0) (2024-10-23)
+
+**Note:** Version bump only for package @rsdk/core
+
 ## [5.2.1-next.2](https://github.com/R-Vision/rsdk/compare/v5.2.1-next.1...v5.2.1-next.2) (2024-10-21)
 
 ### Bug Fixes

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

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

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

@@ -12,6 +12,9 @@ class ConfigMetadataExtractor {
         if (!nest_tools_1.Assert.isObjectOrCtor(value)) {
             return [];
         }
+        if ('useExisting' in value) {
+            return this.handle(value.useExisting);
+        }
         /**
          * Получаем аргументы конструктора
          */
@@ -22,25 +25,23 @@ class ConfigMetadataExtractor {
         if (!Array.isArray(args)) {
             return [];
         }
-        const resources = [];
-        for (const arg of args) {
-            if (!nest_tools_1.Assert.isObjectOrCtor(arg)) {
-                continue;
-            }
-            const isConfigSection = config_1.Config.isConfigSection(arg);
-            if (!isConfigSection) {
-                continue;
-            }
-            resources.push({
-                value: config_1.PlatformConfigModule.createConfigProvider(arg),
-                key: arg,
-                scope: metadata_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
-            });
-            const configs = metadata_1.RsdkMetadata.get(arg);
-            if (configs)
-                resources.push(...configs);
+        return args.flatMap(this.handle);
+    }
+    handle(arg) {
+        if (!nest_tools_1.Assert.isObjectOrCtor(arg)) {
+            return [];
+        }
+        const isConfigSection = config_1.Config.isConfigSection(arg);
+        if (!isConfigSection) {
+            return [];
         }
-        return resources;
+        const rs = {
+            value: config_1.PlatformConfigModule.createConfigProvider(arg),
+            key: arg,
+            scope: metadata_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+        };
+        const configs = metadata_1.RsdkMetadata.get(arg);
+        return [rs, ...(configs ?? [])];
     }
 }
 exports.ConfigMetadataExtractor = ConfigMetadataExtractor;

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

@@ -1 +1 @@
-{"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;AASA,6CAGwB;AACxB,iDAA0D;AAE1D,sCAAyD;AAEzD;;GAEG;AACH,MAAa,uBAAuB;IAClC,OAAO,CACL,KAMkB;QAElB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;QACZ,CAAC;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,CAAC;YACzB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,SAAS,GAAoB,EAAE,CAAC;QAEtC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,SAAS;YACX,CAAC;YACD,MAAM,eAAe,GAAG,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAEpD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,SAAS;YACX,CAAC;YACD,SAAS,CAAC,IAAI,CAA0B;gBACtC,KAAK,EAAE,6BAAoB,CAAC,oBAAoB,CAAC,GAAG,CAAC;gBACrD,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,6CAAkC;aAC1C,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,uBAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAEtC,IAAI,OAAO;gBAAE,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA7CD,0DA6CC"}
+{"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;AAUA,6CAGwB;AACxB,iDAA0D;AAE1D,sCAAyD;AAEzD;;GAEG;AACH,MAAa,uBAAuB;IAClC,OAAO,CACL,KAMkB;QAElB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC;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,CAAC;YACzB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAEO,MAAM,CACZ,GAA+C;QAE/C,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,eAAe,GAAG,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAEpD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,EAAE,GAAqD;YAC3D,KAAK,EAAE,6BAAoB,CAAC,oBAAoB,CAAC,GAAG,CAAC;YACrD,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,6CAAkC;SAC1C,CAAC;QAEF,MAAM,OAAO,GAAG,uBAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEtC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;CACF;AAlDD,0DAkDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "5.2.1-next.2",
+  "version": "5.3.0-next.1",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -49,5 +49,5 @@
       "optional": true
     }
   },
-  "gitHead": "eee528c9d53e17c1ae689ef49f55ce9448c8fc82"
+  "gitHead": "a04a61afbffcd07eb4b559b89cbf4d34b7ff20c9"
 }

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

@@ -4,6 +4,7 @@ import type {
   ExistingProvider,
   FactoryProvider,
   InjectionToken,
+  OptionalFactoryDependency,
   ValueProvider,
 } from '@nestjs/common';
 import type { Resource, ResourceExtractor } from '@rsdk/metadata';
@@ -31,6 +32,9 @@ export class ConfigMetadataExtractor implements ResourceExtractor {
     if (!Assert.isObjectOrCtor(value)) {
       return [];
     }
+    if ('useExisting' in value) {
+      return this.handle(value.useExisting);
+    }
     /**
      * Получаем аргументы конструктора
      */
@@ -41,26 +45,28 @@ export class ConfigMetadataExtractor implements ResourceExtractor {
     if (!Array.isArray(args)) {
       return [];
     }
-    const resources: Resource<any>[] = [];
-
-    for (const arg of args) {
-      if (!Assert.isObjectOrCtor(arg)) {
-        continue;
-      }
-      const isConfigSection = Config.isConfigSection(arg);
+    return args.flatMap(this.handle);
+  }
 
-      if (!isConfigSection) {
-        continue;
-      }
-      resources.push(<Resource<DynamicModule>>{
-        value: PlatformConfigModule.createConfigProvider(arg),
-        key: arg,
-        scope: PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
-      });
-      const configs = RsdkMetadata.get(arg);
+  private handle(
+    arg: InjectionToken | OptionalFactoryDependency,
+  ): Resource<any>[] {
+    if (!Assert.isObjectOrCtor(arg)) {
+      return [];
+    }
+    const isConfigSection = Config.isConfigSection(arg);
 
-      if (configs) resources.push(...configs);
+    if (!isConfigSection) {
+      return [];
     }
-    return resources;
+    const rs: Resource<DynamicModule> = <Resource<DynamicModule>>{
+      value: PlatformConfigModule.createConfigProvider(arg),
+      key: arg,
+      scope: PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+    };
+
+    const configs = RsdkMetadata.get(arg);
+
+    return [rs, ...(configs ?? [])];
   }
 }