@rsdk/metadata 4.0.4 → 4.0.5

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-export { PlatformRawGlobalMetadata, PLATFORM_RAW_GLOBAL_METADATA_SCOPE, RSDK_METADATA_KEY, } from './constants';
+export { PLATFORM_RAW_GLOBAL_METADATA_SCOPE, PlatformRawGlobalMetadata, RSDK_METADATA_KEY, } from './constants';
 export { NestAssert } from './utils/nest-assert';
 export { ResourceExtractor } from './resource-extractor';
 export { RsdkMetadataProvider } from './rsdk-metadata-provider';

package/dist/resource-extractor.d.ts

@@ -3,6 +3,3 @@ import type { Resource } from './metadata';
 export interface ResourceExtractor {
     extract(value: DynamicModule | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | InjectionToken): Resource<unknown>[];
 }
-export interface ModuleExtractor {
-    extract(value: DynamicModule | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | InjectionToken): DynamicModule[];
-}

package/dist/rsdk-metadata-provider.d.ts

@@ -2,22 +2,16 @@ import type { ClassProvider, DynamicModule, ExistingProvider, FactoryProvider, I
 import type { NestModuleDefinition } from '@rsdk/common.nestjs';
 import type { Promisable } from 'type-fest';
 import type { Resource } from './metadata';
-import { ResourceAggregator } from './resource-aggregator';
-import type { ModuleExtractor, ResourceExtractor } from './resource-extractor';
-type Extractors = {
-    resource?: ResourceExtractor[];
-    moduleExtractor?: ModuleExtractor[];
-};
+import type { ResourceExtractor } from './resource-extractor';
 /**
  * Провайдер агрегирующий в себе ресурсы из метаданных
  * По задумке должен выступать лишь в роли фасада/агрегатора который знает о структуре ресурсов и её значении
  * Также он знает о том где могут быть записаны rsdk метаданные
  */
 export declare class RsdkMetadataProvider {
-    private resourceAggregator;
-    private extractors;
-    protected constructor(resourceAggregator: ResourceAggregator, extractors: Extractors | undefined);
-    static create(modules: Promisable<NestModuleDefinition>[], extractors?: Extractors): Promise<RsdkMetadataProvider>;
+    private readonly resources;
+    static create(modules: Promisable<NestModuleDefinition>[], extractors?: ResourceExtractor[]): Promise<RsdkMetadataProvider>;
+    protected constructor(resources: Resource<any>[]);
     static getMetadataSource(nestDefinition: DynamicModule | Type | ClassProvider | ValueProvider | FactoryProvider | ExistingProvider | Function): IterableIterator<InjectionToken | DynamicModule | Type | ClassProvider | ValueProvider | FactoryProvider | ExistingProvider>;
     /**
      * Есть ли уже этот ресурс в массиве
@@ -26,8 +20,7 @@ export declare class RsdkMetadataProvider {
      * @param definitionResource
      */
     static isDuplicate(resources: Resource<any>[], definitionResource: Resource<unknown>): boolean;
-    private static extractResources;
     get<T>(scope?: string): Resource<T>[];
     add(...moduleDef: Promisable<NestModuleDefinition>[]): Promise<void>;
+    private static extractResources;
 }
-export {};

package/dist/rsdk-metadata-provider.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RsdkMetadataProvider = void 0;
 const nest_tools_1 = require("@rsdk/nest-tools");
 const nest_assert_1 = require("./utils/nest-assert");
-const constants_1 = require("./constants");
 const exception_1 = require("./exception");
 const metadata_1 = require("./metadata");
 const resource_aggregator_1 = require("./resource-aggregator");
@@ -13,16 +12,14 @@ const resource_aggregator_1 = require("./resource-aggregator");
  * Также он знает о том где могут быть записаны rsdk метаданные
  */
 class RsdkMetadataProvider {
-    resourceAggregator;
-    extractors;
-    constructor(resourceAggregator, extractors) {
-        this.resourceAggregator = resourceAggregator;
-        this.extractors = extractors;
-    }
+    resources;
     static async create(modules, extractors) {
-        const resourceAggregator = new resource_aggregator_1.ResourceAggregator();
-        await this.extractResources(modules, resourceAggregator, extractors);
-        return new RsdkMetadataProvider(resourceAggregator, extractors);
+        const resources = [];
+        await this.extractResources(modules, resources, extractors);
+        return new RsdkMetadataProvider(resources);
+    }
+    constructor(resources) {
+        this.resources = resources;
     }
     static *getMetadataSource(nestDefinition) {
         // TODO: throw exception
@@ -50,7 +47,17 @@ class RsdkMetadataProvider {
     static isDuplicate(resources, definitionResource) {
         return resources.some((resource) => metadata_1.RsdkMetadata.isEqual(resource, definitionResource));
     }
-    static async extractResources(rootModule, resourceAggregator, extractors) {
+    get(scope) {
+        if (scope === undefined) {
+            return this.resources;
+        }
+        return this.resources.filter((resource) => resource.scope === scope);
+    }
+    async add(...moduleDef) {
+        await RsdkMetadataProvider.extractResources(moduleDef, this.resources);
+    }
+    static async extractResources(rootModule, resources, extractors) {
+        const resourceAggregator = new resource_aggregator_1.ResourceAggregator();
         for await (const rootModuleElement of rootModule) {
             const nestDefinitionIterator = new nest_tools_1.NestDefinitionIterator(rootModuleElement);
             for await (const nestDefinition of nestDefinitionIterator.iterate()) {
@@ -62,7 +69,7 @@ class RsdkMetadataProvider {
                         continue;
                     }
                     const definitionResources = metadata_1.RsdkMetadata.get(metadataSource);
-                    const extractedResources = extractors?.resource?.reduce((acc, extractor) => {
+                    const extractedResources = extractors?.reduce((acc, extractor) => {
                         try {
                             const resources = extractor.extract(metadataSource);
                             acc.push(...resources);
@@ -79,23 +86,11 @@ class RsdkMetadataProvider {
                     if (!foundedResources?.length) {
                         continue;
                     }
-                    const extractedModules = foundedResources
-                        .filter(({ scope }) => scope === constants_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE)
-                        .map(({ value }) => value);
-                    await RsdkMetadataProvider.extractResources(extractedModules, resourceAggregator, extractors);
                     resourceAggregator.add(...foundedResources);
                 }
             }
         }
-    }
-    get(scope) {
-        if (scope === undefined) {
-            return this.resourceAggregator.resources;
-        }
-        return this.resourceAggregator.resources.filter((resource) => resource.scope === scope);
-    }
-    async add(...moduleDef) {
-        await RsdkMetadataProvider.extractResources(moduleDef, this.resourceAggregator, this.extractors);
+        resources.push(...resourceAggregator.resources);
     }
 }
 exports.RsdkMetadataProvider = RsdkMetadataProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/metadata",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "license": "Apache License 2.0",
   "description": "Rsdk stack metadata management",
   "main": "dist/index.js",
@@ -13,10 +13,10 @@
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
-    "@rsdk/common": "^4.0.4",
-    "@rsdk/logging": "^4.0.4",
-    "@rsdk/nest-tools": "^4.0.4",
+    "@rsdk/common": "^4.0.5",
+    "@rsdk/logging": "^4.0.5",
+    "@rsdk/nest-tools": "^4.0.5",
     "reflect-metadata": "^0.1.13"
   },
-  "gitHead": "dd5c6056f19c2ec57a5202aa79a6eb6b7546e620"
+  "gitHead": "374611198a781fec1328b9b2f1ff977eb1bdaa16"
 }