Auto stash before merge of "master" and "origin/master"

Author: kamilmysliwiec

src/core/injector/injector.ts

@@ -352,10 +352,12 @@ export class Injector {
       modules.map((module: Module) => {
         const { relatedModules, exports } = module;
         return this.flatMap(
-          [...relatedModules.values()].filter(related => {
-            const { metatype } = related;
-            return exports.has(metatype.name);
-          }),
+          [...relatedModules.values()]
+            .filter(related => !!related)
+            .filter(related => {
+              const { metatype } = related;
+              return exports.has(metatype.name);
+            }),
         );
       }),
     );

src/core/injector/module.ts

@@ -136,7 +136,7 @@ export class Module {
       name: EXPRESS_REF,
       metatype: {} as any,
       isResolved: true,
-      instance: applicationRef,
+      instance: applicationRef || {},
     });
   }
 

src/microservices/client/client-redis.ts

@@ -28,8 +28,9 @@ export class ClientRedis extends ClientProxy {
     const pattern = JSON.stringify(msg.pattern);
     const responseCallback = (channel, message) => {
       const { err, response, disposed } = JSON.parse(message);
-      if (disposed) {
-        callback(null, null, true);
+
+      if (disposed || err) {
+        callback(err, null, true);
         this.sub.unsubscribe(this.getResPatternName(pattern));
         this.sub.removeListener(MESSAGE_EVENT, responseCallback);
         return;

src/microservices/client/client-tcp.ts

@@ -54,10 +54,9 @@ export class ClientTCP extends ClientProxy {
 
   public handleResponse(socket, callback: (...args) => any, buffer) {
     const { err, response, disposed } = buffer;
-    if (disposed) {
-      callback(null, null, true);
-      socket.end();
-      return;
+    if (disposed || err) {
+      callback(err, null, true);
+      return socket.end();
     }
     callback(err, response);
   }

src/microservices/server/server-redis.ts

@@ -67,8 +67,7 @@ export class ServerRedis extends Server implements CustomTransportStrategy {
     const status = 'error';
 
     if (!this.messageHandlers[pattern]) {
-      publish({ status, error: NO_PATTERN_MESSAGE });
-      return;
+      return publish({ status, err: NO_PATTERN_MESSAGE });
     }
     const handler = this.messageHandlers[pattern];
     const response$ = this.transformToObservable(

src/microservices/server/server-tcp.ts

@@ -39,11 +39,10 @@ export class ServerTCP extends Server implements CustomTransportStrategy {
   public async handleMessage(socket, msg: { pattern: any; data: {} }) {
     const pattern = JSON.stringify(msg.pattern);
     const status = 'error';
+
     if (!this.messageHandlers[pattern]) {
-      socket.sendMessage({ status, error: NO_PATTERN_MESSAGE });
-      return;
+      return socket.sendMessage({ status, err: NO_PATTERN_MESSAGE });
     }
-
     const handler = this.messageHandlers[pattern];
     const response$ = this.transformToObservable(
       await handler(msg.data),

src/testing/testing-module.ts

@@ -23,6 +23,7 @@ export class TestingModule extends NestApplicationContext {
   public createNestApplication(
     expressInstance: any = express(),
   ): INestApplication {
+    this.container.setApplicationRef(expressInstance);
     return new NestApplication(
       this.container,
       expressInstance,