Merge branch 'master' of https://github.com/nestjs/nest

nestjs · Feb 5, 2019 · 7c772b2 · 7c772b2
2 parents 7edf598 + bf04704
commit 7c772b2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/packages/common/interfaces/http/http-server.interface.ts b/packages/common/interfaces/http/http-server.interface.ts
@@ -38,7 +38,7 @@ export interface HttpServer {
   setErrorHandler?(handler: Function);
   setNotFoundHandler?(handler: Function);
   useStaticAssets?(...args: any[]): this;
-  setBaseViewsDir?(path: string): this;
+  setBaseViewsDir?(path: string | string[]): this;
   setViewEngine?(engineOrOptions: any): this;
   createMiddlewareFactory(
     method: RequestMethod,

diff --git a/packages/common/interfaces/nest-express-application.interface.ts b/packages/common/interfaces/nest-express-application.interface.ts
@@ -43,12 +43,12 @@ export interface INestExpressApplication {
   useStaticAssets(path: string, options?: ServeStaticOptions): this;
 
   /**
-   * Sets a base directory for templates (views).
+   * Sets one or multiple base directories for templates (views).
    * Example `app.setBaseViewsDir('views')`
    *
    * @returns {this}
    */
-  setBaseViewsDir(path: string): this;
+  setBaseViewsDir(path: string | string[]): this;
 
   /**
    * Sets a view engine for templates (views).

diff --git a/packages/common/services/logger.service.ts b/packages/common/services/logger.service.ts
@@ -77,13 +77,17 @@ export class Logger implements LoggerService {
     this.printMessage(message, clc.yellow, context, isTimeDiffEnabled);
   }
 
+  protected static isActive(): boolean {
+    return Logger.contextEnvironment !== NestEnvironment.TEST;
+  }
+
   private static printMessage(
     message: any,
     color: (message: string) => string,
     context: string = '',
     isTimeDiffEnabled?: boolean,
   ) {
-    if (Logger.contextEnvironment === NestEnvironment.TEST) {
+    if (!this.isActive()) {
       return;
     }
     const output = isObject(message) ? JSON.stringify(message, null, 2) : message;
@@ -108,7 +112,7 @@ export class Logger implements LoggerService {
   }
 
   private static printStackTrace(trace: string) {
-    if (this.contextEnvironment === NestEnvironment.TEST || !trace) {
+    if (!this.isActive() || !trace) {
       return;
     }
     process.stdout.write(trace);

diff --git a/packages/core/adapters/express-adapter.ts b/packages/core/adapters/express-adapter.ts
@@ -126,7 +126,7 @@ export class ExpressAdapter implements HttpServer {
     return this.use(express.static(path, options));
   }
 
-  setBaseViewsDir(path: string) {
+  setBaseViewsDir(path: string | string[]) {
     return this.set('views', path);
   }
 

diff --git a/packages/core/nest-application.ts b/packages/core/nest-application.ts
@@ -363,7 +363,7 @@ export class NestApplication extends NestApplicationContext
     return this;
   }
 
-  public setBaseViewsDir(path: string): this {
+  public setBaseViewsDir(path: string | string[]): this {
     this.httpAdapter.setBaseViewsDir && this.httpAdapter.setBaseViewsDir(path);
     return this;
   }

diff --git a/packages/microservices/server/server-grpc.ts b/packages/microservices/server/server-grpc.ts
@@ -227,7 +227,7 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
       const nameExtended = this.parseDeepServiceName(name, key);
       const deepDefinition = grpcDefinition[key];
 
-      const isServiceDefined = !isUndefined(deepDefinition.service);
+      const isServiceDefined = deepDefinition && !isUndefined(deepDefinition.service);
       const isServiceBoolean = isServiceDefined
         ? deepDefinition.service !== false
         : false;