Merge branch 'csidell-earny-master'

Author: kamilmysliwiec

packages/common/exceptions/http.exception.ts

@@ -1,3 +1,5 @@
+import { isString } from '../utils/shared.utils';
+
 export class HttpException extends Error {
   public readonly message: any;
 
@@ -30,4 +32,13 @@ export class HttpException extends Error {
   public getStatus(): number {
     return this.status;
   }
+
+  public toString(): string {
+    const message = this.getErrorString(this.message);
+    return `Error: ${message}`;
+  }
+
+  private getErrorString(target: string | object): string {
+    return isString(target) ? target : JSON.stringify(target);
+  }
 }

packages/common/test/exceptions/http.exception.spec.ts

@@ -44,4 +44,29 @@ describe('HttpException', () => {
       statusCode: 404,
     });
   });
+
+  it('should inherit from error', () => {
+    const error = new HttpException('', 400);
+    expect(error instanceof Error).to.be.true;
+  });
+
+  it('should be serializable', () => {
+    const message = 'Some Error';
+    const error = new HttpException(message, 400);
+    expect(`${error}`).to.be.eql(`Error: ${message}`);
+  });
+
+  describe('when "message" is an object', () => {
+    it('should serialize an object', () => {
+      const obj = { foo: 'bar' };
+      const error = new HttpException(obj, 400);
+      expect(`${error}`).to.be.eql(`Error: ${JSON.stringify(obj)}`);
+      expect(`${error}`.includes('[object Object]')).to.not.be.true;
+    });
+
+    it('should serialize sub errors', () => {
+      const error = new NotFoundException();
+      expect(`${error}`.includes('Not Found')).to.be.true;
+    });
+  });
 });

packages/core/application-config.ts

@@ -8,15 +8,19 @@ import {
 import { InstanceWrapper } from './injector/instance-wrapper';
 
 export class ApplicationConfig {
+  private globalPrefix = '';
   private globalPipes: PipeTransform[] = [];
-  private globalRequestPipes: InstanceWrapper<PipeTransform>[] = [];
   private globalFilters: ExceptionFilter[] = [];
-  private globalRequestFilters: InstanceWrapper<ExceptionFilter>[] = [];
   private globalInterceptors: NestInterceptor[] = [];
-  private globalRequestInterceptors: InstanceWrapper<NestInterceptor>[] = [];
   private globalGuards: CanActivate[] = [];
-  private globalRequestGuards: InstanceWrapper<CanActivate>[] = [];
-  private globalPrefix = '';
+  private readonly globalRequestPipes: InstanceWrapper<PipeTransform>[] = [];
+  private readonly globalRequestFilters: InstanceWrapper<
+    ExceptionFilter
+  >[] = [];
+  private readonly globalRequestInterceptors: InstanceWrapper<
+    NestInterceptor
+  >[] = [];
+  private readonly globalRequestGuards: InstanceWrapper<CanActivate>[] = [];
 
   constructor(private ioAdapter: WebSocketAdapter | null = null) {}
 

packages/microservices/exceptions/rpc-exception.ts

@@ -1,3 +1,5 @@
+import { isString } from '@nestjs/common/utils/shared.utils';
+
 export class RpcException extends Error {
   public readonly message: any;
   constructor(private readonly error: string | object) {
@@ -8,4 +10,13 @@ export class RpcException extends Error {
   public getError(): string | object {
     return this.error;
   }
+
+  public toString(): string {
+    const message = this.getErrorString(this.message);
+    return `Error: ${message}`;
+  }
+
+  private getErrorString(target: string | object): string {
+    return isString(target) ? target : JSON.stringify(target);
+  }
 }

packages/microservices/test/exceptions/rpc-exception.spec.ts

@@ -11,4 +11,10 @@ describe('RpcException', () => {
   it('should returns error message or object', () => {
     expect(instance.getError()).to.be.eql(error);
   });
+
+  it('should serialize', () => {
+    expect(`${instance}`.includes(error)).to.be.true;
+    const obj = {foo: 'bar'};
+    expect(`${new RpcException(obj)}`.includes(JSON.stringify(obj))).to.be.true;
+  });
 });

packages/websockets/errors/ws-exception.ts

@@ -1,3 +1,5 @@
+import { isString } from '@nestjs/common/utils/shared.utils';
+
 export class WsException extends Error {
   public readonly message: any;
 
@@ -9,4 +11,13 @@ export class WsException extends Error {
   public getError(): string | object {
     return this.error;
   }
+
+  public toString(): string {
+    const message = this.getErrorString(this.message);
+    return `Error: ${message}`;
+  }
+
+  private getErrorString(target: string | object): string {
+    return isString(target) ? target : JSON.stringify(target);
+  }
 }

packages/websockets/test/exceptions/ws-exception.spec.ts

@@ -11,4 +11,10 @@ describe('WsException', () => {
   it('should returns error message or object', () => {
     expect(instance.getError()).to.be.eql(error);
   });
+
+  it('should serialize', () => {
+    expect(`${instance}`.includes(error)).to.be.true;
+    const obj = {foo: 'bar'};
+    expect(`${new WsException(obj)}`.includes(JSON.stringify(obj))).to.be.true;
+  });
 });