@rsdk/metadata 3.4.0 → 3.4.1-next.0

package/dist/exception.d.ts

@@ -8,4 +8,8 @@ export declare class ExtractFailed extends RsdkMetadataProviderException {
     readonly metadataSource: unknown;
     constructor(exception: unknown, extractor: ResourceExtractor, metadataSource: unknown);
 }
+export declare class IncorrectNestDefinitionType extends RsdkMetadataProviderException {
+    readonly nestDefinition: unknown;
+    constructor(nestDefinition: unknown);
+}
 export {};

package/dist/exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtractFailed = void 0;
+exports.IncorrectNestDefinitionType = exports.ExtractFailed = void 0;
 class RsdkMetadataProviderException extends Error {
     name = this.constructor.name;
 }
@@ -16,3 +16,11 @@ class ExtractFailed extends RsdkMetadataProviderException {
     }
 }
 exports.ExtractFailed = ExtractFailed;
+class IncorrectNestDefinitionType extends RsdkMetadataProviderException {
+    nestDefinition;
+    constructor(nestDefinition) {
+        super(`Expect object, but received: ${nestDefinition}`);
+        this.nestDefinition = nestDefinition;
+    }
+}
+exports.IncorrectNestDefinitionType = IncorrectNestDefinitionType;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import 'reflect-metadata';
+export { NestAssert } from './utils/nest-assert';
 export { ResourceExtractor } from './resource-extractor';
 export { RsdkMetadataProvider } from './rsdk-metadata-provider';
 export { RsdkMetadata, Resource } from './metadata';

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RsdkMetadata = exports.RsdkMetadataProvider = void 0;
+exports.RsdkMetadata = exports.RsdkMetadataProvider = exports.NestAssert = void 0;
 require("reflect-metadata");
+var nest_assert_1 = require("./utils/nest-assert");
+Object.defineProperty(exports, "NestAssert", { enumerable: true, get: function () { return nest_assert_1.NestAssert; } });
 var rsdk_metadata_provider_1 = require("./rsdk-metadata-provider");
 Object.defineProperty(exports, "RsdkMetadataProvider", { enumerable: true, get: function () { return rsdk_metadata_provider_1.RsdkMetadataProvider; } });
 var metadata_1 = require("./metadata");

package/dist/metadata.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RsdkMetadata = void 0;
 const common_1 = require("@rsdk/common");
+const nest_assert_1 = require("./utils/nest-assert");
 const constants_1 = require("./constants");
 /**
  * RSDK metadata for object
@@ -16,9 +17,9 @@ class RsdkMetadata {
     constructor(target, scope) {
         this.target = target;
         this.scope = scope;
-        if (!['object', 'function'].includes(typeof target)) {
+        if (!nest_assert_1.NestAssert.isObjectOrCtor(target)) {
             // TODO InternalException
-            throw new Error((0, common_1.text) `
+            throw new TypeError((0, common_1.text) `
         Target must be object or function.
         Received: <${target}>.
         Type of target: - ${typeof target}

package/dist/resource-aggregator.d.ts

@@ -1,6 +1,6 @@
 import type { Resource } from './metadata';
 /**
- * Хелпер для работы с массивами ресурсов
+ * Хелпер для работы с массивами ресурсов, включающий функционал дедупликации по сигнатуре
  */
 export declare class ResourceAggregator {
     readonly resources: Resource<unknown>[];

package/dist/resource-aggregator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceAggregator = void 0;
 /**
- * Хелпер для работы с массивами ресурсов
+ * Хелпер для работы с массивами ресурсов, включающий функционал дедупликации по сигнатуре
  */
 class ResourceAggregator {
     resources = [];

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

@@ -12,7 +12,7 @@ export declare class RsdkMetadataProvider {
     private readonly resources;
     protected constructor(resources: Resource<any>[]);
     static create(modules: Promisable<NestModuleDefinition>[], extractors?: ResourceExtractor[]): Promise<RsdkMetadataProvider>;
-    static getMetadataSource(nestDefinition: DynamicModule | Type | ClassProvider | ValueProvider | FactoryProvider | ExistingProvider): IterableIterator<InjectionToken | DynamicModule | Type | ClassProvider | ValueProvider | FactoryProvider | ExistingProvider>;
+    static getMetadataSource(nestDefinition: DynamicModule | Type | ClassProvider | ValueProvider | FactoryProvider | ExistingProvider | Function): IterableIterator<InjectionToken | DynamicModule | Type | ClassProvider | ValueProvider | FactoryProvider | ExistingProvider>;
     /**
      * Есть ли уже этот ресурс в массиве
      * Проверка осуществляется на основе `key` и `scope` у `Resource`

package/dist/rsdk-metadata-provider.js

@@ -2,6 +2,7 @@
 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 exception_1 = require("./exception");
 const metadata_1 = require("./metadata");
 const resource_aggregator_1 = require("./resource-aggregator");
@@ -22,8 +23,9 @@ class RsdkMetadataProvider {
     }
     static *getMetadataSource(nestDefinition) {
         // TODO: throw exception
-        if (typeof nestDefinition !== 'object' || nestDefinition === null) {
-            return;
+        if (!nest_assert_1.NestAssert.isNestDefinition(nestDefinition) ||
+            nestDefinition === null) {
+            throw new exception_1.IncorrectNestDefinitionType(nestDefinition);
         }
         if ('useClass' in nestDefinition) {
             yield nestDefinition.useClass;
@@ -50,11 +52,11 @@ class RsdkMetadataProvider {
         for await (const rootModuleElement of rootModule) {
             const nestDefinitionIterator = new nest_tools_1.NestDefinitionIterator(rootModuleElement);
             for await (const nestDefinition of nestDefinitionIterator.iterate()) {
-                if (!['object', 'function'].includes(typeof nestDefinition)) {
+                if (!nest_assert_1.NestAssert.isNestDefinition(nestDefinition)) {
                     continue;
                 }
                 for (const metadataSource of this.getMetadataSource(nestDefinition)) {
-                    if (!['object', 'function'].includes(typeof metadataSource)) {
+                    if (!nest_assert_1.NestAssert.isNestDefinition(metadataSource)) {
                         continue;
                     }
                     const definitionResources = metadata_1.RsdkMetadata.get(metadataSource);

package/dist/utils/nest-assert.d.ts

@@ -0,0 +1,6 @@
+import type { Abstract, ClassProvider, DynamicModule, ExistingProvider, FactoryProvider, Type, ValueProvider } from '@nestjs/common';
+export declare class NestAssert {
+    static isNestDefinition(nestDefinition: DynamicModule | Type<any> | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | string | symbol | Abstract<any>): nestDefinition is DynamicModule | Type<any> | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | Abstract<any> | Function;
+    static isObjectOrCtor(v: unknown): v is object | Function;
+    static isObject(v: unknown): v is object;
+}

package/dist/utils/nest-assert.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NestAssert = void 0;
+class NestAssert {
+    static isNestDefinition(nestDefinition) {
+        return ['object', 'function'].includes(typeof nestDefinition);
+    }
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    static isObjectOrCtor(v) {
+        return ['object', 'function'].includes(typeof v);
+    }
+    static isObject(v) {
+        return typeof v === 'object';
+    }
+}
+exports.NestAssert = NestAssert;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/metadata",
-  "version": "3.4.0",
+  "version": "3.4.1-next.0",
   "license": "Apache License 2.0",
   "description": "Rsdk stack metadata management",
   "main": "dist/index.js",
@@ -15,8 +15,8 @@
     "@nestjs/core": "^10.1.3",
     "@rsdk/common": "^3.2.0",
     "@rsdk/logging": "^3.2.0",
-    "@rsdk/nest-tools": "^3.1.0",
+    "@rsdk/nest-tools": "^3.4.1-next.0",
     "reflect-metadata": "^0.1.13"
   },
-  "gitHead": "7da5c5d884532cbecd4d716f0ee4e8b20e7d7b0f"
+  "gitHead": "ea16db30e841625857ace62dff377e2c5a952980"
 }