refactor(@nestjs) resolve merge conflicts

Author: kamilmysliwiec

integration/microservices/e2e/sum-nats.spec.ts

@@ -1,8 +1,8 @@
-import * as express from 'express';
-import * as request from 'supertest';
-import { Test } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
 import { Transport } from '@nestjs/microservices';
+import { Test } from '@nestjs/testing';
+import * as express from 'express';
+import * as request from 'supertest';
 import { NatsController } from '../src/nats/nats.controller';
 
 describe('NATS transport', () => {
@@ -19,7 +19,7 @@ describe('NATS transport', () => {
     app.connectMicroservice({
       transport: Transport.NATS,
       options: {
-        url: 'nats://localhost:4222'
+        url: 'nats://localhost:4222',
       },
     });
     await app.startAllMicroservicesAsync();
@@ -28,22 +28,22 @@ describe('NATS transport', () => {
 
   it(`/POST`, () => {
     return request(server)
-      .post('/?command=sum')
+      .post('/?command=math.sum')
       .send([1, 2, 3, 4, 5])
       .expect(200, '15');
   });
 
   it(`/POST (Promise/async)`, () => {
     return request(server)
-      .post('/?command=asyncSum')
+      .post('/?command=async.sum')
       .send([1, 2, 3, 4, 5])
       .expect(200)
       .expect(200, '15');
   });
 
   it(`/POST (Observable stream)`, () => {
     return request(server)
-      .post('/?command=streamSum')
+      .post('/?command=stream.sum')
       .send([1, 2, 3, 4, 5])
       .expect(200, '15');
   });

integration/microservices/src/nats/nats-broadcast.controller.ts

@@ -1,8 +1,8 @@
 import { Controller, Get } from '@nestjs/common';
 import {
   Client,
-  MessagePattern,
   ClientProxy,
+  MessagePattern,
   Transport,
 } from '@nestjs/microservices';
 import { Observable } from 'rxjs';
@@ -16,11 +16,11 @@ export class NatsBroadcastController {
   @Get('broadcast')
   multicats() {
     return this.client
-      .send<number>({ cmd: 'broadcast' }, {})
+      .send<number>('broadcast.test', {})
       .pipe(scan((a, b) => a + b), take(2));
   }
 
-  @MessagePattern({ cmd: 'broadcast' })
+  @MessagePattern('broadcast.*')
   replyBroadcast(): Observable<number> {
     return new Observable(observer => observer.next(1));
   }

integration/microservices/src/nats/nats.controller.ts

@@ -1,11 +1,11 @@
-import { Controller, Get, Post, Body, Query, HttpCode } from '@nestjs/common';
+import { Body, Controller, HttpCode, Post, Query } from '@nestjs/common';
 import {
   Client,
-  MessagePattern,
   ClientProxy,
+  MessagePattern,
   Transport,
 } from '@nestjs/microservices';
-import { Observable, of, from } from 'rxjs';
+import { from, Observable, of } from 'rxjs';
 import { scan } from 'rxjs/operators';
 
 @Controller()
@@ -21,14 +21,14 @@ export class NatsController {
   @Post()
   @HttpCode(200)
   call(@Query('command') cmd, @Body() data: number[]): Observable<number> {
-    return this.client.send<number>({ cmd }, data);
+    return this.client.send<number>(cmd, data);
   }
 
   @Post('stream')
   @HttpCode(200)
   stream(@Body() data: number[]): Observable<number> {
     return this.client
-      .send<number>({ cmd: 'streaming' }, data)
+      .send<number>('streaming.sum', data)
       .pipe(scan((a, b) => a + b));
   }
 
@@ -38,7 +38,7 @@ export class NatsController {
     const send = async (tab: number[]) => {
       const expected = tab.reduce((a, b) => a + b);
       const result = await this.client
-        .send<number>({ cmd: 'sum' }, tab)
+        .send<number>('math.sum', tab)
         .toPromise();
 
       return result === expected;
@@ -48,22 +48,22 @@ export class NatsController {
       .reduce(async (a, b) => (await a) && (await b));
   }
 
-  @MessagePattern({ cmd: 'sum' })
+  @MessagePattern('math.*')
   sum(data: number[]): number {
     return (data || []).reduce((a, b) => a + b);
   }
 
-  @MessagePattern({ cmd: 'asyncSum' })
+  @MessagePattern('async.*')
   async asyncSum(data: number[]): Promise<number> {
     return (data || []).reduce((a, b) => a + b);
   }
 
-  @MessagePattern({ cmd: 'streamSum' })
+  @MessagePattern('stream.*')
   streamSum(data: number[]): Observable<number> {
     return of((data || []).reduce((a, b) => a + b));
   }
 
-  @MessagePattern({ cmd: 'streaming' })
+  @MessagePattern('streaming.*')
   streaming(data: number[]): Observable<number> {
     return from(data);
   }

package-lock.json

@@ -31,6 +31,7 @@
   "author": "Kamil Mysliwiec",
   "license": "MIT",
   "dependencies": {
+    "@grpc/proto-loader": "^0.3.0",
     "@nestjs/common": "5.1.0",
     "@nestjs/core": "5.1.0",
     "@nestjs/microservices": "5.1.0",

package.json

@@ -1,5 +1,6 @@
 import * as multer from 'multer';
 import { Observable } from 'rxjs';
+import { mixin } from '../decorators/core/component.decorator';
 import { ExecutionContext } from '../interfaces';
 import { MulterField, MulterOptions } from '../interfaces/external/multer-options.interface';
 import { NestInterceptor } from './../interfaces/features/nest-interceptor.interface';
@@ -9,7 +10,7 @@ export function FileFieldsInterceptor(
   uploadFields: MulterField[],
   options?: MulterOptions,
 ) {
-  const Interceptor = class implements NestInterceptor {
+  const Interceptor = mixin(class implements NestInterceptor {
     readonly upload = multer(options);
 
     async intercept(
@@ -33,6 +34,6 @@ export function FileFieldsInterceptor(
       );
       return call$;
     }
-  };
+  });
   return Interceptor;
 }

packages/common/interceptors/file-fields.interceptor.ts

@@ -1,16 +1,17 @@
 import * as multer from 'multer';
-import { NestInterceptor } from './../interfaces/features/nest-interceptor.interface';
 import { Observable } from 'rxjs';
+import { mixin } from '../decorators/core/component.decorator';
+import { ExecutionContext } from '../interfaces';
 import { MulterOptions } from '../interfaces/external/multer-options.interface';
+import { NestInterceptor } from './../interfaces/features/nest-interceptor.interface';
 import { transformException } from './multer/multer.utils';
-import { ExecutionContext } from '../interfaces';
 
 export function FilesInterceptor(
   fieldName: string,
   maxCount?: number,
   options?: MulterOptions,
 ) {
-  const Interceptor = class implements NestInterceptor {
+  const Interceptor = mixin(class implements NestInterceptor {
     readonly upload = multer(options);
 
     async intercept(
@@ -34,6 +35,6 @@ export function FilesInterceptor(
       );
       return call$;
     }
-  };
+  });
   return Interceptor;
 }