feature(@nestjs/core) injectable APP_REF

Author: kamilmysliwiec

CHANGELOG.md

@@ -1,7 +1,10 @@
+## 4.6.0
+- **core** add ability to inject application reference (`APP_REF` token)
+- **core**: [bugfix] interceptor `$stream` observable returns another observable instead of the response object #376 
+- **core**: [bugfix] `Observable.throw` from controller results in unhandled rejection promise #373
+
 ## 4.5.10
 - **core**: [bugfix] #343
-
-## 4.5.7
 - **core**: [bugfix] #337 
 
 ## 4.5.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs",
-  "version": "4.5.10",
+  "version": "4.6.0",
   "description": "Modern, fast, powerful node.js web framework",
   "main": "index.js",
   "scripts": {

src/core/injector/container.ts

@@ -11,6 +11,8 @@ import { ModuleTokenFactory } from './module-token-factory';
 import { InvalidModuleException } from './../errors/exceptions/invalid-module.exception';
 import { DynamicModule } from '@nestjs/common';
 import { ModulesContainer } from './modules-container';
+import { HostProvidersModule } from './host-module';
+import { NestApplicationContext } from './../nest-application-context';
 
 export class NestContainer {
   private readonly globalModules = new Set<Module>();
@@ -21,6 +23,10 @@ export class NestContainer {
   >();
   private readonly moduleTokenFactory = new ModuleTokenFactory();
 
+  public addHostModule<T extends NestApplicationContext>(applicationRef: T) {
+    this.addModule(HostProvidersModule.extend(applicationRef), []);
+  }
+
   public addModule(
     metatype: NestModuleMetatype | DynamicModule,
     scope: NestModuleMetatype[],
@@ -78,7 +84,7 @@ export class NestContainer {
     if (!modules) {
       return;
     }
-    modules.map((module) => this.addModule(module, scope));
+    modules.map(module => this.addModule(module, scope));
   }
 
   public isGlobalModule(metatype: NestModuleMetatype): boolean {

src/core/injector/host-module.ts

@@ -0,0 +1,27 @@
+import { Module, Global, DynamicModule } from '@nestjs/common';
+import { Reflector } from '../services/reflector.service';
+import { NestApplicationContext } from './../nest-application-context';
+import { APP_REF } from './tokens';
+
+@Global()
+@Module({
+  components: [Reflector],
+  exports: [Reflector],
+})
+export class HostProvidersModule {
+  static extend<T extends NestApplicationContext>(
+    applicationRef: T,
+  ): DynamicModule {
+    const providers = [
+      {
+        provide: APP_REF,
+        useValue: applicationRef,
+      },
+    ];
+    return {
+      module: HostProvidersModule,
+      components: providers,
+      exports: providers,
+    };
+  }
+}

src/core/injector/index.ts

@@ -1 +1,2 @@
 export * from './modules-container';
+export * from './tokens';

src/core/injector/module.ts

@@ -12,7 +12,6 @@ import {
   isSymbol,
 } from '@nestjs/common/utils/shared.utils';
 import { RuntimeException } from '../errors/exceptions/runtime.exception';
-import { Reflector } from '../services/reflector.service';
 import { ExternalContextCreator } from './../helpers/external-context-creator';
 import { GuardsContextCreator } from './../guards/guards-context-creator';
 import { InterceptorsContextCreator } from './../interceptors/interceptors-context-creator';
@@ -91,7 +90,6 @@ export class Module {
   public addCoreInjectables(container: NestContainer) {
     this.addModuleRef();
     this.addModuleAsComponent();
-    this.addReflector();
     this.addExternalContextCreator(container);
     this.addModulesContainer(container);
   }
@@ -115,15 +113,6 @@ export class Module {
     });
   }
 
-  public addReflector() {
-    this._components.set(Reflector.name, {
-      name: Reflector.name,
-      metatype: Reflector,
-      isResolved: false,
-      instance: null,
-    });
-  }
-
   public addExternalContextCreator(container: NestContainer) {
     this._components.set(ExternalContextCreator.name, {
       name: ExternalContextCreator.name,

src/core/injector/tokens.ts

@@ -0,0 +1 @@
+export const APP_REF = 'APP_REF';

src/core/interceptors/interceptors-consumer.ts

@@ -11,7 +11,9 @@ import { HttpStatus, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/toPromise';
 import 'rxjs/add/observable/defer';
+import 'rxjs/add/observable/fromPromise';
 import 'rxjs/add/operator/take';
+import 'rxjs/add/operator/switchMap';
 
 export class InterceptorsConsumer {
   public async intercept(
@@ -25,7 +27,7 @@ export class InterceptorsConsumer {
       return await (await next());
     }
     const context = this.createContext(instance, callback);
-    const start$ = Observable.defer(async () => await this.transformDeffered(next));
+    const start$ = Observable.defer(() => this.transformDeffered(next));
     const result$ = await interceptors.reduce(
       async (stream$, interceptor) =>
         await interceptor.intercept(dataOrRequest, context, await stream$),
@@ -44,9 +46,11 @@ export class InterceptorsConsumer {
     };
   }
 
-  public async transformDeffered(next: () => any): Promise<any> {
-    const res = await next();
-    const isDeffered = res instanceof Promise || res instanceof Observable;
-    return isDeffered ? res : Promise.resolve(res);
+  public transformDeffered(next: () => Promise<any>): Observable<any> {
+    return Observable.fromPromise(next())
+      .switchMap((res) => {
+        const isDeffered = res instanceof Promise || res instanceof Observable;
+        return isDeffered ? res : Promise.resolve(res);
+      });
   }
 }

src/core/nest-application-context.ts

@@ -12,7 +12,9 @@ export class NestApplicationContext implements INestApplicationContext {
     protected readonly container: NestContainer,
     private readonly scope: NestModuleMetatype[],
     protected contextModule,
-  ) {}
+  ) {
+    this.container.addHostModule(this);
+  }
 
   public select<T>(module: Metatype<T>): INestApplicationContext {
     const modules = this.container.getModules();

src/core/router/router-execution-context.ts

@@ -97,7 +97,7 @@ export class RouterExecutionContext {
         callback,
         handler,
       );
-      !isResponseHandled && this.responseController.apply(result, res, httpStatusCode)
+      !isResponseHandled && await this.responseController.apply(result, res, httpStatusCode)
     };
   }