fix: minor code style changes

nestjs · Mar 29, 2020 · 14df600 · 14df600
1 parent 75afe4f
commit 14df600
Show file tree

Hide file tree

Showing 5 changed files with 1,369 additions and 2,080 deletions.
diff --git a/lib/health-check/health-check-executor.service.ts b/lib/health-check/health-check-executor.service.ts
@@ -27,52 +27,6 @@ import {
 export class HealthCheckExecutor implements BeforeApplicationShutdown {
   private isShuttingDown = false;
 
-  private async executeHealthIndicators(
-    healthIndicators: HealthIndicatorFunction[],
-  ) {
-    const results: any[] = [];
-    const errors: any[] = [];
-    for (const healthIndicator of healthIndicators) {
-      try {
-        const result = await healthIndicator();
-        result && results.push(result);
-      } catch (error) {
-        // Is not an expected error. Throw further!
-        if (!error.causes) throw error;
-        // Is a expected health check error
-        errors.push((error as HealthCheckError).causes);
-      }
-    }
-
-    return { results, errors };
-  }
-
-  private getSummary(results: any[]): HealthIndicatorResult {
-    return results.reduce(
-      (previous: any, current: any) => Object.assign(previous, current),
-      {},
-    );
-  }
-
-  private getResult(results: any[], errors: any[]): HealthCheckResult {
-    const infoErrorCombined = (results || []).concat(errors || []);
-
-    const info = this.getSummary(results);
-    const error = this.getSummary(errors);
-    const details = this.getSummary(infoErrorCombined);
-
-    let status: HealthCheckStatus = 'ok';
-    status = errors.length > 0 ? 'error' : status;
-    status = this.isShuttingDown ? 'shutting_down' : status;
-
-    return {
-      status,
-      info,
-      error,
-      details,
-    };
-  }
-
   /**
    * Executes the given health indicators.
    * Implementation for v6 compatibility.
@@ -89,7 +43,7 @@ export class HealthCheckExecutor implements BeforeApplicationShutdown {
     const { results, errors } = await this.executeHealthIndicators(
       healthIndicators,
     );
-    const infoErrorCombined = (results || []).concat(errors || []);
+    const infoErrorCombined = results.concat(errors);
 
     const details = this.getSummary(infoErrorCombined);
 
@@ -125,4 +79,50 @@ export class HealthCheckExecutor implements BeforeApplicationShutdown {
   beforeApplicationShutdown() {
     this.isShuttingDown = true;
   }
+
+  private async executeHealthIndicators(
+    healthIndicators: HealthIndicatorFunction[],
+  ) {
+    const results: any[] = [];
+    const errors: any[] = [];
+    for (const healthIndicator of healthIndicators) {
+      try {
+        const result = await healthIndicator();
+        result && results.push(result);
+      } catch (error) {
+        // Is not an expected error. Throw further!
+        if (!error.causes) throw error;
+        // Is a expected health check error
+        errors.push((error as HealthCheckError).causes);
+      }
+    }
+
+    return { results, errors };
+  }
+
+  private getSummary(results: any[]): HealthIndicatorResult {
+    return results.reduce(
+      (previous: any, current: any) => Object.assign(previous, current),
+      {},
+    );
+  }
+
+  private getResult(results: any[], errors: any[]): HealthCheckResult {
+    const infoErrorCombined = results.concat(errors);
+
+    const info = this.getSummary(results);
+    const error = this.getSummary(errors);
+    const details = this.getSummary(infoErrorCombined);
+
+    let status: HealthCheckStatus = 'ok';
+    status = errors.length > 0 ? 'error' : status;
+    status = this.isShuttingDown ? 'shutting_down' : status;
+
+    return {
+      status,
+      info,
+      error,
+      details,
+    };
+  }
 }
diff --git a/lib/health-check/health-check.decorator.ts b/lib/health-check/health-check.decorator.ts
@@ -1,9 +1,10 @@
-import type * as Swagger from '@nestjs/swagger';
 import { getHealthCheckSchema } from './health-check.schema';
 
+type Swagger = typeof import('@nestjs/swagger');
+
 const noop = () => {};
 
-function getSwaggerDefinitions(swagger: typeof Swagger) {
+function getSwaggerDefinitions(swagger: Swagger) {
   const { ApiOkResponse, ApiServiceUnavailableResponse } = swagger;
 
   // Possible HTTP Status
@@ -25,7 +26,7 @@ function getSwaggerDefinitions(swagger: typeof Swagger) {
 }
 
 export const HealthCheck = () => {
-  let swagger: typeof Swagger | null = null;
+  let swagger: Swagger | null = null;
   try {
     // Dynamically load swagger, in case it is not installed
     swagger = require('@nestjs/swagger');

diff --git a/lib/terminus-lib.provider.ts b/lib/terminus-lib.provider.ts
@@ -14,9 +14,6 @@ export const TerminusLibProvider = {
       ['@godaddy/terminus'],
       'the legacy Terminus API',
     );
-    if (!terminus) {
-      process.exit(1);
-    }
-    return terminus.createTerminus;
+    return terminus?.createTerminus;
   },
 };