@rsdk/nest-tools 3.4.1 → 3.6.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.6.0](https://github.com/R-Vision/rsdk/compare/v3.6.0-next.8...v3.6.0) (2023-10-20)
+
+**Note:** Version bump only for package @rsdk/nest-tools
+
+## [3.6.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.5.0...v3.6.0-next.0) (2023-10-06)
+
+### Features
+
+* discover config from inject section in dynamic provider ([b20c41c](https://github.com/R-Vision/rsdk/commit/b20c41c08802c2ece7c3fe24614959722cae12b4))
+
 ## [3.4.1](https://github.com/R-Vision/rsdk/compare/v3.4.1-next.0...v3.4.1) (2023-09-01)
 
 **Note:** Version bump only for package @rsdk/nest-tools

package/dist/assert.d.ts

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

package/dist/assert.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Assert = void 0;
+class Assert {
+    static isObjectOrCtor(nestDefinition) {
+        return (['object', 'function'].includes(typeof nestDefinition) &&
+            nestDefinition !== null);
+    }
+    static isObject(v) {
+        return typeof v === 'object';
+    }
+}
+exports.Assert = Assert;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { NestDefinitionType } from './constants';
 export { NestDefinitionIterator } from './nest-definition.iterator';
 export { NestDefinition } from './nest-definition';
+export { Assert } from './assert';

package/dist/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NestDefinition = exports.NestDefinitionIterator = exports.NestDefinitionType = void 0;
+exports.Assert = exports.NestDefinition = exports.NestDefinitionIterator = exports.NestDefinitionType = void 0;
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "NestDefinitionType", { enumerable: true, get: function () { return constants_1.NestDefinitionType; } });
 var nest_definition_iterator_1 = require("./nest-definition.iterator");
 Object.defineProperty(exports, "NestDefinitionIterator", { enumerable: true, get: function () { return nest_definition_iterator_1.NestDefinitionIterator; } });
 var nest_definition_1 = require("./nest-definition");
 Object.defineProperty(exports, "NestDefinition", { enumerable: true, get: function () { return nest_definition_1.NestDefinition; } });
+var assert_1 = require("./assert");
+Object.defineProperty(exports, "Assert", { enumerable: true, get: function () { return assert_1.Assert; } });

package/dist/nest-definition.d.ts

@@ -1,4 +1,4 @@
-import type { DynamicModule, InjectionToken, Provider, Type } from '@nestjs/common';
+import type { Abstract, ClassProvider, DynamicModule, ExistingProvider, FactoryProvider, InjectionToken, OptionalFactoryDependency, Provider, Type, ValueProvider } from '@nestjs/common';
 export type NestModuleDefinition = DynamicModule | Type;
 /**
  * Хелпер для работы с объявлением модуля nest.
@@ -7,6 +7,9 @@ export type NestModuleDefinition = DynamicModule | Type;
 export declare class NestDefinition {
     private definition;
     constructor(definition: NestModuleDefinition);
+    static extractDeps(value: DynamicModule | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | Type<any> | Abstract<any> | Function): (InjectionToken | OptionalFactoryDependency)[];
+    static extractInjectDeps(value: DynamicModule | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | Type<any> | Abstract<any> | Function): (InjectionToken | OptionalFactoryDependency)[];
+    static hasInjectDeps(value: DynamicModule | ClassProvider<any> | ValueProvider<any> | FactoryProvider<any> | ExistingProvider<any> | Type<any> | Abstract<any> | Function): value is FactoryProvider & Required<Pick<FactoryProvider, 'inject'>>;
     getProviders(): Provider[] | undefined;
     getImports(): NestModuleDefinition[] | undefined;
     getControllers(): Type[] | undefined;

package/dist/nest-definition.iterator.d.ts

@@ -1,11 +1,7 @@
-import type { Abstract, ClassProvider, DynamicModule, ExistingProvider, FactoryProvider, InjectionToken, Provider, Type, ValueProvider } from '@nestjs/common';
+import type { InjectionToken, Provider } from '@nestjs/common';
 import type { Promisable } from 'type-fest';
 import { NestDefinitionType } from './constants';
 import type { NestModuleDefinition } from './nest-definition';
-export declare class Assert {
-    static isObjectOrCtor(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 isObject(v: unknown): v is object;
-}
 export declare class NestDefinitionIterator {
     private nestModuleDefinition;
     constructor(nestModuleDefinition: Promisable<NestModuleDefinition>);

package/dist/nest-definition.iterator.js

@@ -1,18 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NestDefinitionIterator = exports.Assert = void 0;
+exports.NestDefinitionIterator = void 0;
+const assert_1 = require("./assert");
 const constants_1 = require("./constants");
 const exception_1 = require("./exception");
 const nest_definition_1 = require("./nest-definition");
-class Assert {
-    static isObjectOrCtor(nestDefinition) {
-        return ['object', 'function'].includes(typeof nestDefinition);
-    }
-    static isObject(v) {
-        return typeof v === 'object';
-    }
-}
-exports.Assert = Assert;
 class NestDefinitionIterator {
     nestModuleDefinition;
     constructor(nestModuleDefinition) {
@@ -64,7 +56,7 @@ class NestDefinitionIterator {
     }
     async find(predicate, type) {
         for await (const definition of this.iterate(type)) {
-            if (!Assert.isObjectOrCtor(definition)) {
+            if (!assert_1.Assert.isObjectOrCtor(definition)) {
                 throw new exception_1.UnexpectedNestModuleDefinitionValue(definition);
             }
             const isNeeded = predicate(definition);

package/dist/nest-definition.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestDefinition = void 0;
 const constants_1 = require("@nestjs/common/constants");
 const scanner_1 = require("@nestjs/core/scanner");
+const assert_1 = require("./assert");
 /**
  * Хелпер для работы с объявлением модуля nest.
  * Получения провайдеров и импортов
@@ -12,6 +13,30 @@ class NestDefinition {
     constructor(definition) {
         this.definition = definition;
     }
+    static extractDeps(value) {
+        const designParamTypes = Reflect.getMetadata('design:paramtypes', value);
+        if (designParamTypes) {
+            return designParamTypes;
+        }
+        if (this.hasInjectDeps(value)) {
+            return this.extractInjectDeps(value);
+        }
+        return [];
+    }
+    static extractInjectDeps(value) {
+        if (!this.hasInjectDeps(value)) {
+            throw new Error('Incorrect argument, expected FactoryProvider');
+        }
+        return value.inject.map((obj) => {
+            if (assert_1.Assert.isObjectOrCtor(obj) && 'token' in obj) {
+                return obj.token;
+            }
+            return obj;
+        });
+    }
+    static hasInjectDeps(value) {
+        return 'inject' in value && Boolean(value.inject);
+    }
     getProviders() {
         return scanner_1.DependenciesScanner.prototype.isDynamicModule(this.definition)
             ? [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nest-tools",
-  "version": "3.4.1",
+  "version": "3.6.0",
   "license": "Apache License 2.0",
   "publishConfig": {
     "access": "public"
@@ -10,5 +10,5 @@
     "@nestjs/common": "^10.1.3",
     "@nestjs/core": "^10.1.3"
   },
-  "gitHead": "54dcdaa65d9a9f6c19bf6c6abefcb48921bacf18"
+  "gitHead": "cc75fb4595bd49e877974f6eeeef66f30743011c"
 }

package/src/assert.ts

@@ -0,0 +1,31 @@
+import type {
+  Abstract,
+  ClassProvider,
+  DynamicModule,
+  ExistingProvider,
+  FactoryProvider,
+  Type,
+  ValueProvider,
+} from '@nestjs/common';
+
+export class Assert {
+  static isObjectOrCtor(nestDefinition: unknown): nestDefinition is
+    | DynamicModule
+    | Type<any>
+    | ClassProvider<any>
+    | ValueProvider<any>
+    | FactoryProvider<any>
+    | ExistingProvider<any>
+    | Abstract<any>
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    | Function {
+    return (
+      ['object', 'function'].includes(typeof nestDefinition) &&
+      nestDefinition !== null
+    );
+  }
+
+  static isObject(v: unknown): v is object {
+    return typeof v === 'object';
+  }
+}

package/src/index.ts

@@ -3,3 +3,4 @@ export { NestDefinitionType } from './constants';
 export { NestDefinitionIterator } from './nest-definition.iterator';
 
 export { NestDefinition } from './nest-definition';
+export { Assert } from './assert';

package/src/nest-definition.iterator.ts

@@ -1,16 +1,7 @@
-import type {
-  Abstract,
-  ClassProvider,
-  DynamicModule,
-  ExistingProvider,
-  FactoryProvider,
-  InjectionToken,
-  Provider,
-  Type,
-  ValueProvider,
-} from '@nestjs/common';
+import type { InjectionToken, Provider } from '@nestjs/common';
 import type { Promisable } from 'type-fest';
 
+import { Assert } from './assert';
 import { NestDefinitionType } from './constants';
 import {
   FalsyValueInNestModuleTree,
@@ -19,36 +10,6 @@ import {
 import type { NestModuleDefinition } from './nest-definition';
 import { NestDefinition } from './nest-definition';
 
-export class Assert {
-  static isObjectOrCtor(
-    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>
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    | Function {
-    return ['object', 'function'].includes(typeof nestDefinition);
-  }
-
-  static isObject(v: unknown): v is object {
-    return typeof v === 'object';
-  }
-}
-
 export class NestDefinitionIterator {
   constructor(private nestModuleDefinition: Promisable<NestModuleDefinition>) {}
 

package/src/nest-definition.ts

@@ -1,12 +1,20 @@
 import type {
+  Abstract,
+  ClassProvider,
   DynamicModule,
+  ExistingProvider,
+  FactoryProvider,
   InjectionToken,
+  OptionalFactoryDependency,
   Provider,
   Type,
+  ValueProvider,
 } from '@nestjs/common';
 import { MODULE_METADATA } from '@nestjs/common/constants';
 import { DependenciesScanner } from '@nestjs/core/scanner';
 
+import { Assert } from './assert';
+
 export type NestModuleDefinition = DynamicModule | Type;
 
 /**
@@ -16,6 +24,66 @@ export type NestModuleDefinition = DynamicModule | Type;
 export class NestDefinition {
   constructor(private definition: NestModuleDefinition) {}
 
+  static extractDeps(
+    value:
+      | DynamicModule
+      | ClassProvider<any>
+      | ValueProvider<any>
+      | FactoryProvider<any>
+      | ExistingProvider<any>
+      | Type<any>
+      | Abstract<any>
+      // eslint-disable-next-line @typescript-eslint/ban-types
+      | Function,
+  ): (InjectionToken | OptionalFactoryDependency)[] {
+    const designParamTypes = Reflect.getMetadata('design:paramtypes', value);
+    if (designParamTypes) {
+      return designParamTypes;
+    }
+    if (this.hasInjectDeps(value)) {
+      return this.extractInjectDeps(value);
+    }
+    return [];
+  }
+
+  static extractInjectDeps(
+    value:
+      | DynamicModule
+      | ClassProvider<any>
+      | ValueProvider<any>
+      | FactoryProvider<any>
+      | ExistingProvider<any>
+      | Type<any>
+      | Abstract<any>
+      // eslint-disable-next-line @typescript-eslint/ban-types
+      | Function,
+  ): (InjectionToken | OptionalFactoryDependency)[] {
+    if (!this.hasInjectDeps(value)) {
+      throw new Error('Incorrect argument, expected FactoryProvider');
+    }
+    return value.inject.map((obj) => {
+      if (Assert.isObjectOrCtor(obj) && 'token' in obj) {
+        return obj.token as InjectionToken;
+      }
+      return obj;
+    });
+  }
+
+  static hasInjectDeps(
+    value:
+      | DynamicModule
+      | ClassProvider<any>
+      | ValueProvider<any>
+      | FactoryProvider<any>
+      | ExistingProvider<any>
+      | Type<any>
+      | Abstract<any>
+      // eslint-disable-next-line @typescript-eslint/ban-types
+      | Function,
+  ): value is FactoryProvider & Required<Pick<FactoryProvider, 'inject'>> {
+    return 'inject' in value && Boolean(value.inject);
+  }
+
   getProviders(): Provider[] | undefined {
     return DependenciesScanner.prototype.isDynamicModule(this.definition)
       ? [