Update package.json

Author: kamilmysliwiec

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.1.0
+- **common**: add `@Bind()` and `@Dependencies()` decorators to fix route parameters decorators (pure JavaScript compatibility issue)
+- **core**: improve performance
+
 ## 4.0.1
 - **core**: add possibility to setup global guards and global interceptors
 - **common**: `INestApplication` has `useGlobalInterceptors()` and `useGlobalGuards()` now

Readme.md

@@ -59,6 +59,14 @@ $ npm install
 $ npm run start
 ```
 
+**Install the JavaScript (Babel) Starter Project with Git:**
+```bash
+$ git clone https://github.com/nestjs/javascript-starter.git project
+$ cd project
+$ npm install
+$ npm run start
+```
+
 **Start a New Project from Scratch with NPM:**
 ```bash
 $ npm i --save @nestjs/core @nestjs/common @nestjs/microservices @nestjs/websockets @nestjs/testing reflect-metadata rxjs

examples/09-babel-example/.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["env", "stage-0"],
+  "plugins": ["transform-decorators-legacy"]
+}

examples/09-babel-example/package.json

@@ -6,26 +6,25 @@
   "scripts": {
     "build": "babel src -d dist",
     "prestart": "npm run build",
-    "start": "node index.js",
-    "start:prod": "node dist/server.js"
+    "start": "node index.js"
   },
   "dependencies": {
     "@nestjs/common": "^4.0.1",
     "@nestjs/core": "^4.0.1",
     "@nestjs/microservices": "^4.0.1",
     "@nestjs/testing": "^4.0.1",
     "@nestjs/websockets": "^4.0.1",
+    "babel-core": "^6.26.0",
+    "babel-polyfill": "^6.26.0",
     "body-parser": "^1.17.2",
     "redis": "^2.7.1",
     "reflect-metadata": "^0.1.10",
     "rxjs": "^5.4.3"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-stage-0": "^6.24.1"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "Modern, fast, powerful node.js web framework",
   "main": "index.js",
   "scripts": {

src/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/common",
-  "version": "4.0.3",
+  "version": "4.1.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@common)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",

src/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",

src/core/router/router-execution-context.ts

@@ -44,8 +44,9 @@ export class RouterExecutionContext {
         const guards = this.guardsContextCreator.create(instance, callback, module);
         const interceptors = this.interceptorsContextCreator.create(instance, callback, module);
         const httpCode = this.reflectHttpStatusCode(callback);
-        const paramProperties = this.exchangeKeysForValues(keys, metadata);
-        const isResponseObj = paramProperties.some(({ type }) => type === RouteParamtypes.RESPONSE);
+        const paramsMetadata = this.exchangeKeysForValues(keys, metadata);
+        const isResponseObj = paramsMetadata.some(({ type }) => type === RouteParamtypes.RESPONSE);
+        const paramsOptions = this.mergeParamsMetatypes(paramsMetadata, paramtypes);
 
         return async (req, res, next) => {
             const args = this.createNullArray(argsLength);
@@ -54,9 +55,8 @@ export class RouterExecutionContext {
                 throw new HttpException(FORBIDDEN_MESSAGE, HttpStatus.FORBIDDEN);
             }
 
-            await Promise.all(paramProperties.map(async (param) => {
-                const { index, extractValue, type, data, pipes: paramPipes } = param;
-                const metatype = paramtypes ? paramtypes[index] : null;
+            await Promise.all(paramsOptions.map(async (param) => {
+                const { index, extractValue, type, data, metatype, pipes: paramPipes } = param;
                 const value = extractValue(req, res, next);
 
                 args[index] = await this.getParamValue(
@@ -109,6 +109,16 @@ export class RouterExecutionContext {
         });
     }
 
+    public mergeParamsMetatypes(
+      paramsProperties: ParamProperties[],
+      paramtypes: any[],
+    ): (ParamProperties & { metatype?: any })[] {
+      if (!paramtypes) {
+        return paramsProperties;
+      }
+      return paramsProperties.map((param) => ({ ...param, metatype: paramtypes[param.index] }));
+    }
+
     public async getParamValue<T>(
         value: T,
         { metatype, type, data },

src/core/test/router/router-execution-context.spec.ts

@@ -41,6 +41,7 @@ describe('RouterExecutionContext', () => {
     describe('create', () => {
         describe('when callback metadata is not undefined', () => {
             let metadata: RouteParamsMetadata;
+            let exchangeKeysForValuesSpy: sinon.SinonSpy;
             beforeEach(() => {
                 metadata = {
                     [RouteParamtypes.NEXT]: { index: 0 },
@@ -51,6 +52,17 @@ describe('RouterExecutionContext', () => {
                 };
                 sinon.stub(contextCreator, 'reflectCallbackMetadata').returns(metadata);
                 sinon.stub(contextCreator, 'reflectCallbackParamtypes').returns([]);
+                exchangeKeysForValuesSpy = sinon.spy(contextCreator, 'exchangeKeysForValues');
+            });
+            it('should call "exchangeKeysForValues" with expected arguments', (done) => {
+                const keys = Object.keys(metadata);
+
+                contextCreator.create({ foo: 'bar' }, callback as any, '', 0);
+                expect(exchangeKeysForValuesSpy.called).to.be.true;
+                expect(
+                    exchangeKeysForValuesSpy.calledWith(keys, metadata),
+                ).to.be.true;
+                done();
             });
             describe('returns proxy function', () => {
                 let proxyContext;
@@ -64,7 +76,6 @@ describe('RouterExecutionContext', () => {
                     expect(proxyContext).to.be.a('function');
                 });
                 describe('when proxy function called', () => {
-                    let exchangeKeysForValuesSpy: sinon.SinonSpy;
                     let request;
                     const response = {
                         status: () => response,
@@ -79,18 +90,6 @@ describe('RouterExecutionContext', () => {
                                 test: 3,
                             },
                         };
-                        exchangeKeysForValuesSpy = sinon.spy(contextCreator, 'exchangeKeysForValues');
-                    });
-                    it('should call "exchangeKeysForValues" with expected arguments', (done) => {
-                        proxyContext(request, response, next).then(() => {
-                            const keys = Object.keys(metadata);
-
-                            expect(exchangeKeysForValuesSpy.called).to.be.true;
-                            expect(
-                                exchangeKeysForValuesSpy.calledWith(keys, metadata, { req: request, res: response, next }),
-                            ).to.be.true;
-                            done();
-                        });
                     });
                     it('should apply expected context and arguments to callback', (done) => {
                         proxyContext(request, response, next).then(() => {
@@ -161,12 +160,13 @@ describe('RouterExecutionContext', () => {
                 },
             };
             const keys = Object.keys(metadata);
-            const values = contextCreator.exchangeKeysForValues(keys, metadata, { res, req, next });
+            const values = contextCreator.exchangeKeysForValues(keys, metadata);
             const expectedValues = [
-                { index: 0, value: req, type: RouteParamtypes.REQUEST, data: 'test', pipes: [] },
-                { index: 2, value: req.body.test, type: RouteParamtypes.BODY, data: 'test', pipes: [] },
+                { index: 0, type: RouteParamtypes.REQUEST, data: 'test' },
+                { index: 2, type: RouteParamtypes.BODY, data: 'test' },
             ];
-            expect(values).to.deep.equal(expectedValues);
+            expect(values[0]).to.deep.include(expectedValues[0]);
+            expect(values[1]).to.deep.include(expectedValues[1]);
         });
     });
     describe('getParamValue', () => {

src/microservices/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/microservices",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@microservices)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",