sample(grpc) update packages to latest patch versions

kamilmysliwiec · kamilmysliwiec · commit 66c0b8cf5c28 · 2018-09-13T10:43:56.000+02:00
diff --git a/bundle/common/Readme.md b/bundle/common/Readme.md
@@ -58,7 +58,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 #### Sponsors
 
-<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a>
+<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="34" /></a>
+
 
 ## Backers
 
diff --git a/bundle/core/Readme.md b/bundle/core/Readme.md
@@ -58,7 +58,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 #### Sponsors
 
-<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a>
+<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="34" /></a>
+
 
 ## Backers
 
diff --git a/bundle/core/errors/exceptions/circular-dependency.exception.d.ts b/bundle/core/errors/exceptions/circular-dependency.exception.d.ts
@@ -1,4 +1,4 @@
 import { RuntimeException } from './runtime.exception';
 export declare class CircularDependencyException extends RuntimeException {
-    constructor(context: string);
+    constructor(context?: string);
 }
diff --git a/bundle/core/errors/exceptions/circular-dependency.exception.js b/bundle/core/errors/exceptions/circular-dependency.exception.js
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const runtime_exception_1 = require("./runtime.exception");
 class CircularDependencyException extends runtime_exception_1.RuntimeException {
     constructor(context) {
-        super(`A circular dependency has been detected inside ${context}. Please, make sure that each side of a bidirectional relationships are decorated with "forwardRef()".`);
+        const ctx = context ? ` inside ${context}` : ``;
+        super(`A circular dependency has been detected${ctx}. Please, make sure that each side of a bidirectional relationships are decorated with "forwardRef()".`);
     }
 }
 exports.CircularDependencyException = CircularDependencyException;
diff --git a/bundle/core/injector/container.js b/bundle/core/injector/container.js
@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("@nestjs/common/constants");
 require("reflect-metadata");
+const circular_dependency_exception_1 = require("../errors/exceptions/circular-dependency.exception");
 const invalid_module_exception_1 = require("../errors/exceptions/invalid-module.exception");
 const unknown_module_exception_1 = require("../errors/exceptions/unknown-module.exception");
 const application_ref_host_1 = require("../helpers/application-ref-host");
@@ -81,6 +82,9 @@ class NestContainer {
         module.addRelatedModule(related);
     }
     addComponent(component, token) {
+        if (!component) {
+            throw new circular_dependency_exception_1.CircularDependencyException();
+        }
         if (!this.modules.has(token)) {
             throw new unknown_module_exception_1.UnknownModuleException();
         }
diff --git a/bundle/core/router/router-execution-context.d.ts b/bundle/core/router/router-execution-context.d.ts
@@ -41,7 +41,7 @@ export declare class RouterExecutionContext {
         type: any;
         data: any;
     }, transforms: Transform<any>[]): Promise<any>;
-    createGuardsFn(guards: any[], instance: Controller, callback: (...args) => any): (args: any[]) => Promise<void>;
+    createGuardsFn(guards: any[], instance: Controller, callback: (...args) => any): Function | null;
     createPipesFn(pipes: any[], paramsOptions: (ParamProperties & {
         metatype?: any;
     })[]): (args: any, req: any, res: any, next: any) => Promise<void>;
diff --git a/bundle/microservices/Readme.md b/bundle/microservices/Readme.md
@@ -58,7 +58,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 #### Sponsors
 
-<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a>
+<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="34" /></a>
+
 
 ## Backers
 
diff --git a/bundle/microservices/client/client-grpc.js b/bundle/microservices/client/client-grpc.js
@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_service_1 = require("@nestjs/common/services/logger.service");
 const load_package_util_1 = require("@nestjs/common/utils/load-package.util");
+const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const rxjs_1 = require("rxjs");
 const constants_1 = require("../constants");
 const invalid_grpc_package_exception_1 = require("../exceptions/errors/invalid-grpc-package.exception");
@@ -23,7 +24,8 @@ class ClientGrpcProxy extends client_proxy_1.ClientProxy {
         this.grpcClient = this.createClient();
     }
     getService(name) {
-        const options = this.options;
+        const options = shared_utils_1.isObject(this.options)
+            ? Object.assign({}, this.options, { loader: '' }) : {};
         if (!this.grpcClient[name]) {
             throw new invalid_grpc_service_exception_1.InvalidGrpcServiceException();
         }
diff --git a/bundle/microservices/context/rpc-context-creator.d.ts b/bundle/microservices/context/rpc-context-creator.d.ts
@@ -21,4 +21,5 @@ export declare class RpcContextCreator {
     create(instance: Controller, callback: (data) => Observable<any>, module: any): (...args) => Promise<Observable<any>>;
     reflectCallbackParamtypes(instance: Controller, callback: (...args) => any): any[];
     getDataMetatype(instance: any, callback: any): any;
+    createGuardsFn(guards: any[], instance: Controller, callback: (...args) => any): Function | null;
 }
diff --git a/bundle/microservices/context/rpc-context-creator.js b/bundle/microservices/context/rpc-context-creator.js
@@ -20,16 +20,14 @@ class RpcContextCreator {
         const guards = this.guardsContextCreator.create(instance, callback, module);
         const metatype = this.getDataMetatype(instance, callback);
         const interceptors = this.interceptorsContextCreator.create(instance, callback, module);
+        const fnCanActivate = this.createGuardsFn(guards, instance, callback);
         const handler = (args) => async () => {
             const [data, ...params] = args;
             const result = await this.pipesConsumer.applyPipes(data, { metatype }, pipes);
             return callback.call(instance, result, ...params);
         };
         return this.rpcProxy.create(async (...args) => {
-            const canActivate = await this.guardsConsumer.tryActivate(guards, args, instance, callback);
-            if (!canActivate) {
-                throw new __1.RpcException(constants_2.FORBIDDEN_MESSAGE);
-            }
+            fnCanActivate && (await fnCanActivate(args));
             return await this.interceptorsConsumer.intercept(interceptors, args, instance, callback, handler(args));
         }, exceptionHandler);
     }
@@ -40,5 +38,14 @@ class RpcContextCreator {
         const paramtypes = this.reflectCallbackParamtypes(instance, callback);
         return paramtypes && paramtypes.length ? paramtypes[0] : null;
     }
+    createGuardsFn(guards, instance, callback) {
+        const canActivateFn = async (args) => {
+            const canActivate = await this.guardsConsumer.tryActivate(guards, args, instance, callback);
+            if (!canActivate) {
+                throw new __1.RpcException(constants_2.FORBIDDEN_MESSAGE);
+            }
+        };
+        return guards.length ? canActivateFn : null;
+    }
 }
 exports.RpcContextCreator = RpcContextCreator;
diff --git a/bundle/microservices/context/rpc-proxy.js b/bundle/microservices/context/rpc-proxy.js
@@ -4,11 +4,11 @@ const execution_context_host_1 = require("@nestjs/core/helpers/execution-context
 class RpcProxy {
     create(targetCallback, exceptionsHandler) {
         return async (...args) => {
-            const host = new execution_context_host_1.ExecutionContextHost(args);
             try {
                 return await targetCallback(...args);
             }
             catch (e) {
+                const host = new execution_context_host_1.ExecutionContextHost(args);
                 return exceptionsHandler.handle(e, host);
             }
         };
diff --git a/bundle/testing/Readme.md b/bundle/testing/Readme.md
@@ -58,7 +58,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 #### Sponsors
 
-<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a>
+<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="34" /></a>
+
 
 ## Backers
 
diff --git a/bundle/websockets/Readme.md b/bundle/websockets/Readme.md
@@ -58,7 +58,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 #### Sponsors
 
-<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a>
+<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="34" /></a>
+
 
 ## Backers
 
diff --git a/bundle/websockets/context/ws-context-creator.d.ts b/bundle/websockets/context/ws-context-creator.d.ts
@@ -1,12 +1,12 @@
-import { WsProxy } from './ws-proxy';
-import { ExceptionFiltersContext } from './exception-filters-context';
 import { Controller } from '@nestjs/common/interfaces';
-import { PipesContextCreator } from '@nestjs/core/pipes/pipes-context-creator';
-import { PipesConsumer } from '@nestjs/core/pipes/pipes-consumer';
-import { GuardsContextCreator } from '@nestjs/core/guards/guards-context-creator';
 import { GuardsConsumer } from '@nestjs/core/guards/guards-consumer';
+import { GuardsContextCreator } from '@nestjs/core/guards/guards-context-creator';
 import { InterceptorsConsumer } from '@nestjs/core/interceptors/interceptors-consumer';
 import { InterceptorsContextCreator } from '@nestjs/core/interceptors/interceptors-context-creator';
+import { PipesConsumer } from '@nestjs/core/pipes/pipes-consumer';
+import { PipesContextCreator } from '@nestjs/core/pipes/pipes-context-creator';
+import { ExceptionFiltersContext } from './exception-filters-context';
+import { WsProxy } from './ws-proxy';
 export declare class WsContextCreator {
     private readonly wsProxy;
     private readonly exceptionFiltersContext;
@@ -20,4 +20,5 @@ export declare class WsContextCreator {
     create(instance: Controller, callback: (...args) => void, module: any): (...args) => Promise<void>;
     reflectCallbackParamtypes(instance: Controller, callback: (...args) => any): any[];
     getDataMetatype(instance: any, callback: any): any;
+    createGuardsFn(guards: any[], instance: Controller, callback: (...args) => any): Function | null;
 }
diff --git a/bundle/websockets/context/ws-context-creator.js b/bundle/websockets/context/ws-context-creator.js
@@ -20,16 +20,14 @@ class WsContextCreator {
         const guards = this.guardsContextCreator.create(instance, callback, module);
         const metatype = this.getDataMetatype(instance, callback);
         const interceptors = this.interceptorsContextCreator.create(instance, callback, module);
+        const fnCanActivate = this.createGuardsFn(guards, instance, callback);
         const handler = (args) => async () => {
             const [client, data, ...params] = args;
             const result = await this.pipesConsumer.applyPipes(data, { metatype }, pipes);
             return callback.call(instance, client, result, ...params);
         };
         return this.wsProxy.create(async (...args) => {
-            const canActivate = await this.guardsConsumer.tryActivate(guards, args, instance, callback);
-            if (!canActivate) {
-                throw new ws_exception_1.WsException(constants_2.FORBIDDEN_MESSAGE);
-            }
+            fnCanActivate && (await fnCanActivate(args));
             return await this.interceptorsConsumer.intercept(interceptors, args, instance, callback, handler(args));
         }, exceptionHandler);
     }
@@ -40,5 +38,14 @@ class WsContextCreator {
         const paramtypes = this.reflectCallbackParamtypes(instance, callback);
         return paramtypes && paramtypes.length ? paramtypes[1] : null;
     }
+    createGuardsFn(guards, instance, callback) {
+        const canActivateFn = async (args) => {
+            const canActivate = await this.guardsConsumer.tryActivate(guards, args, instance, callback);
+            if (!canActivate) {
+                throw new ws_exception_1.WsException(constants_2.FORBIDDEN_MESSAGE);
+            }
+        };
+        return guards.length ? canActivateFn : null;
+    }
 }
 exports.WsContextCreator = WsContextCreator;
diff --git a/bundle/websockets/context/ws-proxy.js b/bundle/websockets/context/ws-proxy.js
@@ -4,11 +4,11 @@ const execution_context_host_1 = require("@nestjs/core/helpers/execution-context
 class WsProxy {
     create(targetCallback, exceptionsHandler) {
         return async (...args) => {
-            const host = new execution_context_host_1.ExecutionContextHost(args);
             try {
                 return await targetCallback(...args);
             }
             catch (e) {
+                const host = new execution_context_host_1.ExecutionContextHost(args);
                 exceptionsHandler.handle(e, host);
             }
         };
diff --git a/sample/04-grpc/package.json b/sample/04-grpc/package.json
@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "@grpc/proto-loader": "^0.3.0",
-    "@nestjs/common": "^5.3.0",
-    "@nestjs/core": "^5.3.0",
-    "@nestjs/microservices": "^5.3.0",
-    "@nestjs/testing": "^5.3.0",
-    "@nestjs/websockets": "^5.3.0",
+    "@nestjs/common": "^5.3.7",
+    "@nestjs/core": "^5.3.7",
+    "@nestjs/microservices": "^5.3.7",
+    "@nestjs/testing": "^5.3.7",
+    "@nestjs/websockets": "^5.3.7",
     "class-transformer": "^0.1.7",
     "class-validator": "^0.7.2",
     "grpc": "^1.10.0",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`import { RuntimeException } from './runtime.exception';`
`2`	`2`	`export declare class CircularDependencyException extends RuntimeException {`
`3`		`- constructor(context: string);`
	`3`	`+ constructor(context?: string);`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });`
`3`	`3`	`const runtime_exception_1 = require("./runtime.exception");`
`4`	`4`	`class CircularDependencyException extends runtime_exception_1.RuntimeException {`
`5`	`5`	`constructor(context) {`
`6`		- super(`A circular dependency has been detected inside ${context}. Please, make sure that each side of a bidirectional relationships are decorated with "forwardRef()".`);
	`6`	+ const ctx = context ? ` inside ${context}` : ``;
	`7`	+ super(`A circular dependency has been detected${ctx}. Please, make sure that each side of a bidirectional relationships are decorated with "forwardRef()".`);
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`	`exports.CircularDependencyException = CircularDependencyException;`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,5 @@ export declare class RpcContextCreator {`
`21`	`21`	`create(instance: Controller, callback: (data) => Observable<any>, module: any): (...args) => Promise<Observable<any>>;`
`22`	`22`	`reflectCallbackParamtypes(instance: Controller, callback: (...args) => any): any[];`
`23`	`23`	`getDataMetatype(instance: any, callback: any): any;`
	`24`	`+ createGuardsFn(guards: any[], instance: Controller, callback: (...args) => any): Function \| null;`
`24`	`25`	`}`