feature(@nestjs/common) add @Injectable() class, providers property integration

Author: kamilmysliwiec

src/common/constants.ts

@@ -2,6 +2,7 @@ export const metadata = {
   MODULES: 'modules',
   IMPORTS: 'imports',
   COMPONENTS: 'components',
+  PROVIDERS: 'providers',
   CONTROLLERS: 'controllers',
   EXPORTS: 'exports',
 };

src/common/decorators/core/component.decorator.ts

@@ -1,3 +1,11 @@
+/**
+ * Defines the injectable class. This class can inject dependencies through constructor.
+ * Those dependencies should belongs to the same module.
+ */
+export function Injectable(): ClassDecorator {
+  return (target: object) => {};
+}
+
 /**
  * Defines the Component. The component can inject dependencies through constructor.
  * Those dependencies should belongs to the same module.

src/common/decorators/core/inject.decorator.ts

@@ -3,8 +3,8 @@ import { SELF_DECLARED_DEPS_METADATA } from '../../constants';
 import { isFunction } from '../../utils/shared.utils';
 
 /**
- * Injects component, which has to be available in the current injector (module) scope.
- * Components are recognized by types / or tokens.
+ * Injects provider, which has to be available in the current injector (module) scope.
+ * Providers are recognized by types / or tokens.
  */
 export function Inject(token): ParameterDecorator {
   return (target, key, index) => {

src/common/decorators/modules/module.decorator.ts

@@ -9,14 +9,16 @@ const metadataKeys = [
   metadata.EXPORTS,
   metadata.COMPONENTS,
   metadata.CONTROLLERS,
+  metadata.PROVIDERS,
 ];
 
 const validateKeys = (keys: string[]) => {
-  const isKeyValid = key => metadataKeys.findIndex(k => k === key) < 0;
+  const isKeyInvalid = key => metadataKeys.findIndex(k => k === key) < 0;
   const validateKey = key => {
-    if (isKeyValid(key)) {
-      throw new InvalidModuleConfigException(key);
+    if (!isKeyInvalid(key)) {
+      return;
     }
+    throw new InvalidModuleConfigException(key);
   };
   keys.forEach(validateKey);
 };
@@ -25,16 +27,16 @@ const validateKeys = (keys: string[]) => {
  * Defines the module
  * - `imports` - the set of the 'imported' modules
  * - `controllers` - the list of controllers (e.g. HTTP controllers)
- * - `components` - the list of components that belong to this module. They can be injected between themselves.
+ * - `providers` - the list of providers that belong to this module. They can be injected between themselves.
  * - `exports` - the set of components, which should be available for modules, which imports this module
  * - `modules` - @deprecated the set of the 'imported' modules
+ * - `components` - @deprecated the list of components that belong to this module. They can be injected between themselves.
  * @param obj {ModuleMetadata} Module metadata
  */
 export function Module(obj: ModuleMetadata): ClassDecorator {
   const propsKeys = Object.keys(obj);
   validateKeys(propsKeys);
-
-  obj.modules = obj.imports && !obj.modules ? obj.imports : obj.modules;
+  overrideModuleMetadata(obj);
 
   return (target: object) => {
     for (const property in obj) {
@@ -44,3 +46,13 @@ export function Module(obj: ModuleMetadata): ClassDecorator {
     }
   };
 }
+
+function overrideModuleMetadata(metadata: ModuleMetadata) {
+  metadata.modules = metadata.imports
+    ? metadata.imports
+    : metadata.modules;
+
+  metadata.components = metadata.providers
+    ? metadata.providers
+    : metadata.components;
+}

src/common/decorators/modules/shared.decorator.ts

@@ -4,8 +4,9 @@ import { DynamicModule } from './dynamic-module.interface';
 
 export interface ModuleMetadata {
   imports?: any[];
-  components?: any[];
   controllers?: any[];
+  providers?: any[];
   exports?: any[];
   modules?: any[];
+  components?: any[];
 }

src/common/interfaces/modules/module-metadata.interface.ts

@@ -1,6 +1,6 @@
 import { Constructor } from './merge-with-values.util';
 import { NestMiddleware } from '../interfaces/middlewares/nest-middleware.interface';
-import { Component } from '../decorators/core/component.decorator';
+import { Injectable } from '../decorators/core/component.decorator';
 
 export const BindResolveMiddlewareValues = <
   T extends Constructor<NestMiddleware>
@@ -15,7 +15,7 @@ export const BindResolveMiddlewareValues = <
     };
     const token = Metatype.name + JSON.stringify(data);
     Object.defineProperty(type, 'name', { value: token });
-    Component()(type);
+    Injectable()(type);
     return type;
   };
 };

src/common/utils/bind-resolve-values.util.ts

@@ -1,4 +1,3 @@
-import { HttpException as DeprecatedHttpException } from './http-exception';
 import { messages } from '../constants';
 import { Logger } from '@nestjs/common';
 import { ExceptionFilterMetadata } from '@nestjs/common/interfaces/exceptions/exception-filter-metadata.interface';
@@ -13,12 +12,7 @@ export class ExceptionsHandler {
   public next(exception: Error | HttpException | any, response) {
     if (this.invokeCustomFilters(exception, response)) return;
 
-    if (
-      !(
-        exception instanceof HttpException ||
-        exception instanceof DeprecatedHttpException
-      )
-    ) {
+    if (!(exception instanceof HttpException)) {
       response.status(500).json({
         statusCode: 500,
         message: messages.UNKNOWN_EXCEPTION_MESSAGE,

src/core/exceptions/exceptions-handler.ts

@@ -23,24 +23,6 @@ export class MiddlewareBuilder implements MiddlewaresConsumer {
     return new MiddlewareBuilder.ConfigProxy(this, middlewares);
   }
 
-  /**
-   * @deprecated
-   * Since version RC.6 this method is deprecated. Use apply() instead.
-   */
-  public use(configuration: MiddlewareConfiguration) {
-    this.logger.warn(
-      'DEPRECATED! Since version RC.6 `use()` method is deprecated. Use `apply()` instead.',
-    );
-
-    const { middlewares, forRoutes } = configuration;
-    if (isUndefined(middlewares) || isUndefined(forRoutes)) {
-      throw new InvalidMiddlewareConfigurationException();
-    }
-
-    this.middlewaresCollection.add(configuration);
-    return this;
-  }
-
   public build() {
     return [...this.middlewaresCollection];
   }