refactor(core) simplify getType usage

Author: kamilmysliwiec

packages/common/index.ts

@@ -18,6 +18,7 @@ export {
   BeforeApplicationShutdown,
   CallHandler,
   CanActivate,
+  ContextType,
   DynamicModule,
   ExceptionFilter,
   ExecutionContext,
@@ -39,12 +40,12 @@ export {
   Provider,
   RpcExceptionFilter,
   Scope,
+  ScopeOptions,
   Type,
   ValidationError,
   WebSocketAdapter,
   WsExceptionFilter,
   WsMessageHandler,
-  ScopeOptions,
 } from './interfaces';
 export * from './pipes';
 export * from './serializer';

packages/common/interfaces/features/arguments-host.interface.ts

@@ -52,7 +52,7 @@ export interface RpcArgumentsHost {
  *
  * @publicApi
  */
-export interface ArgumentsHost<TContext extends string = ContextType> {
+export interface ArgumentsHost {
   /**
    * Returns the array of arguments being passed to the handler.
    */
@@ -80,5 +80,5 @@ export interface ArgumentsHost<TContext extends string = ContextType> {
   /**
    * Returns the current execution context type (string)
    */
-  getType(): TContext;
+  getType<TContext extends string = ContextType>(): TContext;
 }

packages/common/interfaces/features/execution-context.interface.ts

@@ -1,5 +1,5 @@
 import { Type } from '../index';
-import { ArgumentsHost, ContextType } from './arguments-host.interface';
+import { ArgumentsHost } from './arguments-host.interface';
 
 /**
  * Interface describing details about the current request pipeline.
@@ -8,8 +8,7 @@ import { ArgumentsHost, ContextType } from './arguments-host.interface';
  *
  * @publicApi
  */
-export interface ExecutionContext<TContext extends ContextType = ContextType>
-  extends ArgumentsHost<TContext> {
+export interface ExecutionContext extends ArgumentsHost {
   /**
    * Returns the *type* of the controller class which the current handler belongs to.
    */

packages/core/guards/guards-consumer.ts

@@ -16,7 +16,7 @@ export class GuardsConsumer {
       return true;
     }
     const context = this.createContext(args, instance, callback);
-    context.setType(type);
+    context.setType<TContext>(type);
 
     for (const guard of guards) {
       const result = guard.canActivate(context);

packages/core/helpers/execution-context-host.ts

@@ -7,22 +7,21 @@ import {
   WsArgumentsHost,
 } from '@nestjs/common/interfaces/features/arguments-host.interface';
 
-export class ExecutionContextHost<TContext extends ContextType = ContextType>
-  implements ExecutionContext<TContext> {
-  private contextType: TContext = 'http' as TContext;
+export class ExecutionContextHost implements ExecutionContext {
+  private contextType = 'http';
 
   constructor(
     private readonly args: any[],
     private readonly constructorRef: Type<any> = null,
     private readonly handler: Function = null,
   ) {}
 
-  setType(type: TContext) {
+  setType<TContext extends string = ContextType>(type: TContext) {
     type && (this.contextType = type);
   }
 
-  getType(): TContext {
-    return this.contextType;
+  getType<TContext extends string = ContextType>(): TContext {
+    return this.contextType as TContext;
   }
 
   getClass<T = any>(): Type<T> {

packages/core/helpers/external-proxy.ts

@@ -13,7 +13,7 @@ export class ExternalErrorProxy {
         return await targetCallback(...args);
       } catch (e) {
         const host = new ExecutionContextHost(args);
-        host.setType(type);
+        host.setType<TContext>(type);
         return exceptionsHandler.next(e, host);
       }
     };

packages/core/interceptors/interceptors-consumer.ts

@@ -22,7 +22,7 @@ export class InterceptorsConsumer {
       return next();
     }
     const context = this.createContext(args, instance, callback);
-    context.setType(type);
+    context.setType<TContext>(type);
 
     const start$ = defer(() => this.transformDeffered(next));
     const nextFn = (i = 0) => async () => {