Merge branch 'nestjs:master' into fix-fastify-platfom-custom-methods

Author: johaven

.gitignore

@@ -1,5 +1,5 @@
 packages/*/package-lock.json
-sample/*/package-lock.json
+sample/**/package-lock.json
 
 # dependencies
 node_modules/

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Stack Overflow is a much better place to ask questions since:
 
 <!-- - there are thousands of people willing to help on Stack Overflow [maybe one day] -->
 
-- questions and answers stay available for public viewing so your question / answer might help someone else
+- questions and answers stay available for public viewing so your question / answer might help someone else.
 - Stack Overflow's voting system assures that the best answers are prominently visible.
 
 To save your and our time, we will systematically close all issues that are requests for general support and redirect people to Stack Overflow.

integration/docker-compose.yml

@@ -51,7 +51,7 @@ services:
   zookeeper:
     container_name: test-zookeeper
     hostname: zookeeper
-    image: confluentinc/cp-zookeeper:7.8.0
+    image: confluentinc/cp-zookeeper:7.9.0
     ports:
       - "2181:2181"
     environment:
@@ -60,7 +60,7 @@ services:
   kafka:
     container_name: test-kafka
     hostname: kafka
-    image: confluentinc/cp-kafka:7.8.0
+    image: confluentinc/cp-kafka:7.9.0
     depends_on:
       - zookeeper
     ports:

integration/hello-world/e2e/middleware-execute-order.spec.ts

@@ -22,7 +22,17 @@ class GlobalModule {
   }
 }
 
-@Module({ imports: [GlobalModule] })
+@Global()
+@Module({})
+class GlobalModule2 {
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply((req, res, next) => res.send(RETURN_VALUE_GLOBAL + '2'))
+      .forRoutes('ping');
+  }
+}
+
+@Module({ imports: [GlobalModule, GlobalModule2] })
 class ModuleX {
   configure(consumer: MiddlewareConsumer) {
     consumer

integration/hello-world/e2e/middleware-fastify.spec.ts

@@ -450,9 +450,14 @@ describe('Middleware (FastifyAdapter)', () => {
           .apply((req, res, next) => {
             req.extras = { data: 'Data attached in middleware' };
             req.headers['ping'] = 'pong';
+
+            // When global prefix is set and the route is the root path
+            if (req.originalUrl === '/api') {
+              return res.end(JSON.stringify({ success: true, pong: 'pong' }));
+            }
             next();
           })
-          .forRoutes('*');
+          .forRoutes('{*path}');
       }
     }
 
@@ -464,7 +469,7 @@ describe('Middleware (FastifyAdapter)', () => {
       ).createNestApplication<NestFastifyApplication>(new FastifyAdapter());
     });
 
-    it(`GET forRoutes('*') with global prefix`, async () => {
+    it(`GET forRoutes('{*path}') with global prefix (route: /api/pong)`, async () => {
       app.setGlobalPrefix('/api');
       await app.init();
       await app.getHttpAdapter().getInstance().ready();
@@ -483,7 +488,26 @@ describe('Middleware (FastifyAdapter)', () => {
         );
     });
 
-    it(`GET forRoutes('*') without prefix config`, async () => {
+    it(`GET forRoutes('{*path}') with global prefix (route: /api)`, async () => {
+      app.setGlobalPrefix('/api');
+      await app.init();
+      await app.getHttpAdapter().getInstance().ready();
+      return app
+        .inject({
+          method: 'GET',
+          url: '/api',
+        })
+        .then(({ payload }) =>
+          expect(payload).to.be.eql(
+            JSON.stringify({
+              success: true,
+              pong: 'pong',
+            }),
+          ),
+        );
+    });
+
+    it(`GET forRoutes('{*path}') without prefix config`, async () => {
       await app.init();
       await app.getHttpAdapter().getInstance().ready();
       return app
@@ -501,7 +525,7 @@ describe('Middleware (FastifyAdapter)', () => {
         );
     });
 
-    it(`GET forRoutes('*') with global prefix and exclude patterns`, async () => {
+    it(`GET forRoutes('{*path}') with global prefix and exclude patterns`, async () => {
       app.setGlobalPrefix('/api', { exclude: ['/'] });
       await app.init();
       await app.getHttpAdapter().getInstance().ready();
@@ -511,7 +535,7 @@ describe('Middleware (FastifyAdapter)', () => {
         .expect(200, { success: true, root: true });
     });
 
-    it(`GET forRoutes('*') with global prefix and global prefix options`, async () => {
+    it(`GET forRoutes('{*path}') with global prefix and global prefix options`, async () => {
       app.setGlobalPrefix('/api', { exclude: ['/'] });
       await app.init();
       await app.getHttpAdapter().getInstance().ready();
@@ -528,7 +552,7 @@ describe('Middleware (FastifyAdapter)', () => {
         .expect(200, { success: true, root: true });
     });
 
-    it(`GET forRoutes('*') with global prefix that not starts with /`, async () => {
+    it(`GET forRoutes('{*path}') with global prefix that not starts with /`, async () => {
       app.setGlobalPrefix('api');
       await app.init();
       await app.getHttpAdapter().getInstance().ready();

integration/lazy-modules/e2e/lazy-import-request-providers.spec.ts

@@ -0,0 +1,30 @@
+import { INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { expect } from 'chai';
+import * as request from 'supertest';
+import { LazyController } from '../src/lazy.controller';
+
+describe('Lazy Requested Scoped providers', () => {
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    const module = await Test.createTestingModule({
+      controllers: [LazyController],
+    }).compile();
+
+    app = module.createNestApplication();
+    await app.init();
+  });
+
+  it('should not recreate dependencies for default scope', async () => {
+    const resultOne = await request(app.getHttpServer()).get('/lazy/request');
+
+    expect(resultOne.text).to.be.equal('Hi! Counter is 1');
+    expect(resultOne.statusCode).to.be.equal(200);
+
+    const resultTwo = await request(app.getHttpServer()).get('/lazy/request');
+
+    expect(resultTwo.text).to.be.equal('Hi! Counter is 2');
+    expect(resultTwo.statusCode).to.be.equal(200);
+  });
+});

integration/lazy-modules/src/lazy.controller.ts

@@ -13,6 +13,16 @@ export class LazyController {
     const { TransientService } = await import('./transient.service');
     const _service = await moduleRef.resolve(TransientService);
 
+    return _service.eager();
+  }
+  @Get('request')
+  async execRequestScope() {
+    const { RequestLazyModule } = await import('./request.module');
+    const moduleRef = await this.lazyLoadModule.load(() => RequestLazyModule);
+
+    const { RequestService } = await import('./request.service');
+    const _service = await moduleRef.resolve(RequestService);
+
     return _service.eager();
   }
 }

integration/lazy-modules/src/request.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { EagerService } from './eager.module';
+import { GlobalService } from './global.module';
+import { RequestService } from './request.service';
+
+@Module({
+  imports: [],
+  providers: [RequestService, GlobalService, EagerService],
+  exports: [RequestService],
+})
+export class RequestLazyModule {}

integration/lazy-modules/src/request.service.ts

@@ -0,0 +1,11 @@
+import { Injectable, Scope } from '@nestjs/common';
+import { EagerService } from './eager.module';
+
+@Injectable({ scope: Scope.REQUEST })
+export class RequestService {
+  constructor(private eagerService: EagerService) {}
+
+  eager() {
+    return this.eagerService.sayHello();
+  }
+}

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "11.0.5"
+  "version": "11.0.12"
 }