chore(nestjs) publish 5.3.1 release

kamilmysliwiec · kamilmysliwiec · commit 713e97f6c33d · 2018-09-03T17:10:59.000+02:00
diff --git a/bundle/common/cache/interceptors/cache.interceptor.d.ts b/bundle/common/cache/interceptors/cache.interceptor.d.ts
@@ -1,10 +1,10 @@
 import { Observable } from 'rxjs';
 import { ExecutionContext, HttpServer, NestInterceptor } from '../../interfaces';
 export declare class CacheInterceptor implements NestInterceptor {
-    private readonly httpServer;
-    private readonly cacheManager;
-    private readonly reflector;
-    private readonly isHttpApp;
+    protected readonly httpServer: HttpServer;
+    protected readonly cacheManager: any;
+    protected readonly reflector: any;
+    protected readonly isHttpApp: boolean;
     constructor(httpServer: HttpServer, cacheManager: any, reflector: any);
     intercept(context: ExecutionContext, call$: Observable<any>): Promise<Observable<any>>;
     getCacheKey(context: ExecutionContext): string | undefined;
diff --git a/bundle/common/decorators/core/component.decorator.js b/bundle/common/decorators/core/component.decorator.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const deprecate = require("deprecate");
-const generateSafeId = require("generate-safe-id");
+const uuid = require("uuid/v4");
 /**
  * Defines the injectable class. This class can inject dependencies through constructor.
  * Those dependencies have to belong to the same module.
@@ -58,7 +58,7 @@ function Interceptor() {
 exports.Interceptor = Interceptor;
 function mixin(mixinClass) {
     Object.defineProperty(mixinClass, 'name', {
-        value: generateSafeId(),
+        value: uuid(),
     });
     Injectable()(mixinClass);
     return mixinClass;
diff --git a/bundle/common/decorators/http/create-route-param-metadata.decorator.js b/bundle/common/decorators/http/create-route-param-metadata.decorator.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const deprecate = require("deprecate");
-const generateSafeId = require("generate-safe-id");
+const uuid = require("uuid/v4");
 const constants_1 = require("../../constants");
 const shared_utils_1 = require("../../utils/shared.utils");
 const assignCustomMetadata = (args, paramtype, index, factory, data, ...pipes) => (Object.assign({}, args, { [`${paramtype}${constants_1.CUSTOM_ROUTE_AGRS_METADATA}:${index}`]: {
@@ -15,7 +15,7 @@ const assignCustomMetadata = (args, paramtype, index, factory, data, ...pipes) =
  * @param factory
  */
 function createParamDecorator(factory, enhancers = []) {
-    const paramtype = generateSafeId();
+    const paramtype = uuid();
     return (data, ...pipes) => (target, key, index) => {
         const args = Reflect.getMetadata(constants_1.ROUTE_ARGS_METADATA, target.constructor, key) || {};
         const isPipe = pipe => pipe &&
diff --git a/bundle/common/index.d.ts b/bundle/common/index.d.ts
@@ -4,7 +4,7 @@ export * from './enums';
 export * from './exceptions';
 export * from './files';
 export * from './http';
-export { ArgumentMetadata, ArgumentsHost, CanActivate, DynamicModule, ExceptionFilter, ExecutionContext, ForwardReference, HttpServer, HttpServerFactory, INestApplication, INestApplicationContext, INestExpressApplication, INestFastifyApplication, INestMicroservice, MiddlewareConsumer, MiddlewareFunction, NestInterceptor, NestMiddleware, NestModule, OnModuleDestroy, OnModuleInit, Paramtype, PipeTransform, Provider, RpcExceptionFilter, Type, WebSocketAdapter, WsExceptionFilter } from './interfaces';
+export { ArgumentMetadata, ArgumentsHost, CanActivate, DynamicModule, ExceptionFilter, ExecutionContext, ForwardReference, HttpServer, HttpServerFactory, INestApplication, INestApplicationContext, INestExpressApplication, INestFastifyApplication, INestMicroservice, MiddlewareConsumer, MiddlewareFunction, NestInterceptor, NestMiddleware, NestModule, OnApplicationBootstrap, OnModuleDestroy, OnModuleInit, Paramtype, PipeTransform, Provider, RpcExceptionFilter, Type, WebSocketAdapter, WsExceptionFilter } from './interfaces';
 export * from './pipes';
 export * from './serializer';
 export * from './services/logger.service';
diff --git a/bundle/common/interfaces/index.d.ts b/bundle/common/interfaces/index.d.ts
@@ -1,33 +1,32 @@
-export * from './request-mapping-metadata.interface';
-export * from './modules/nest-module.interface';
-export * from './modules/module-metadata.interface';
-export * from './controllers/controller.interface';
-export * from './injectable.interface';
 export * from './controllers/controller-metadata.interface';
-export * from './modules/module-metadata.interface';
-export * from './type.interface';
-export * from './nest-application.interface';
-export * from './nest-microservice.interface';
-export * from './nest-application-context.interface';
-export * from './modules/on-init.interface';
-export * from './modules/on-destroy.interface';
+export * from './controllers/controller.interface';
 export * from './exceptions/exception-filter.interface';
-export * from './middleware';
-export * from './websockets/web-socket-adapter.interface';
-export * from './features/pipe-transform.interface';
-export * from './features/paramtype.interface';
-export * from './features/can-activate.interface';
 export * from './exceptions/rpc-exception-filter.interface';
 export * from './exceptions/ws-exception-filter.interface';
+export * from './features/arguments-host.interface';
+export * from './features/can-activate.interface';
+export * from './features/custom-route-param-factory.interface';
 export * from './features/execution-context.interface';
 export * from './features/nest-interceptor.interface';
-export * from './features/custom-route-param-factory.interface';
-export * from './modules/dynamic-module.interface';
-export * from './http/http-server.interface';
+export * from './features/paramtype.interface';
+export * from './features/pipe-transform.interface';
 export * from './http/http-server-factory.interface';
-export * from './features/arguments-host.interface';
+export * from './http/http-server.interface';
+export * from './injectable.interface';
+export * from './middleware';
+export * from './modules/dynamic-module.interface';
+export * from './modules/forward-reference.interface';
+export * from './modules/module-metadata.interface';
+export * from './modules/nest-module.interface';
+export * from './modules/on-destroy.interface';
+export * from './modules/on-init.interface';
+export * from './modules/provider.interface';
+export * from './nest-application-context.interface';
+export * from './nest-application.interface';
 export * from './nest-express-application.interface';
 export * from './nest-fastify-application.interface';
-export * from './modules/provider.interface';
+export * from './nest-microservice.interface';
+export * from './on-application-bootstrap.interface';
+export * from './request-mapping-metadata.interface';
 export * from './type.interface';
-export * from './modules/forward-reference.interface';
+export * from './websockets/web-socket-adapter.interface';
diff --git a/bundle/common/interfaces/on-application-bootstrap.interface.d.ts b/bundle/common/interfaces/on-application-bootstrap.interface.d.ts
@@ -0,0 +1,3 @@
+export interface OnApplicationBootstrap {
+    onApplicationBootstrap(): any;
+}
diff --git a/bundle/common/interfaces/on-application-bootstrap.interface.js b/bundle/common/interfaces/on-application-bootstrap.interface.js
@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/bundle/common/serializer/class-serializer.interceptor.d.ts b/bundle/common/serializer/class-serializer.interceptor.d.ts
@@ -5,7 +5,7 @@ export interface PlainLiteralObject {
     [key: string]: any;
 }
 export declare class ClassSerializerInterceptor implements NestInterceptor {
-    private readonly reflector;
+    protected readonly reflector: any;
     constructor(reflector: any);
     intercept(context: ExecutionContext, call$: Observable<any>): Observable<any>;
     serialize(response: PlainLiteralObject | Array<PlainLiteralObject>, options: ClassTransformOptions): PlainLiteralObject | PlainLiteralObject[];
diff --git a/bundle/common/utils/random-string-generator.util.js b/bundle/common/utils/random-string-generator.util.js
@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const generateSafeId = require("generate-safe-id");
-exports.randomStringGenerator = () => generateSafeId();
+const uuid = require("uuid/v4");
+exports.randomStringGenerator = () => uuid();
diff --git a/bundle/core/guards/guards-consumer.js b/bundle/core/guards/guards-consumer.js
@@ -25,9 +25,6 @@ class GuardsConsumer {
         if (result instanceof rxjs_1.Observable) {
             return await result.toPromise();
         }
-        if (result instanceof Promise) {
-            return await result;
-        }
         return result;
     }
 }
diff --git a/bundle/core/helpers/external-context-creator.js b/bundle/core/helpers/external-context-creator.js
@@ -102,10 +102,7 @@ class ExternalContextCreator {
         return await this.pipesConsumer.apply(value, { metatype, type, data }, transforms);
     }
     async transformToResult(resultOrDeffered) {
-        if (resultOrDeffered instanceof Promise) {
-            return await resultOrDeffered;
-        }
-        else if (resultOrDeffered && shared_utils_1.isFunction(resultOrDeffered.subscribe)) {
+        if (resultOrDeffered && shared_utils_1.isFunction(resultOrDeffered.subscribe)) {
             return await resultOrDeffered.toPromise();
         }
         return resultOrDeffered;
diff --git a/bundle/core/nest-application-context.d.ts b/bundle/core/nest-application-context.d.ts
@@ -1,4 +1,4 @@
-import { INestApplicationContext, LoggerService, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { INestApplicationContext, LoggerService, OnApplicationBootstrap, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { Type } from '@nestjs/common/interfaces/type.interface';
 import { NestContainer } from './injector/container';
 import { Module } from './injector/module';
@@ -22,4 +22,7 @@ export declare class NestApplicationContext extends ModuleRef implements INestAp
     protected callDestroyHook(): Promise<any>;
     protected callModuleDestroyHook(module: Module): Promise<any>;
     protected hasOnModuleDestroyHook(instance: any): instance is OnModuleDestroy;
+    protected callBootstrapHook(): Promise<any>;
+    protected callModuleBootstrapHook(module: Module): Promise<any>;
+    protected hasOnAppBotstrapHook(instance: any): instance is OnApplicationBootstrap;
 }
diff --git a/bundle/core/nest-application-context.js b/bundle/core/nest-application-context.js
@@ -36,6 +36,7 @@ class NestApplicationContext extends module_ref_1.ModuleRef {
     }
     async init() {
         await this.callInitHook();
+        await this.callBootstrapHook();
         return this;
     }
     async close() {
@@ -93,5 +94,27 @@ class NestApplicationContext extends module_ref_1.ModuleRef {
     hasOnModuleDestroyHook(instance) {
         return !shared_utils_1.isUndefined(instance.onModuleDestroy);
     }
+    async callBootstrapHook() {
+        const modulesContainer = this.container.getModules();
+        for (const module of [...modulesContainer.values()].reverse()) {
+            await this.callModuleBootstrapHook(module);
+        }
+    }
+    async callModuleBootstrapHook(module) {
+        const components = [...module.components];
+        const [_, { instance: moduleClassInstance }] = components.shift();
+        const instances = [...module.routes, ...components];
+        await Promise.all(iterare_1.default(instances)
+            .map(([key, { instance }]) => instance)
+            .filter(instance => !shared_utils_1.isNil(instance))
+            .filter(this.hasOnModuleInitHook)
+            .map(async (instance) => await instance.onApplicationBootstrap()));
+        if (moduleClassInstance && this.hasOnAppBotstrapHook(moduleClassInstance)) {
+            await moduleClassInstance.onApplicationBootstrap();
+        }
+    }
+    hasOnAppBotstrapHook(instance) {
+        return !shared_utils_1.isUndefined(instance.onApplicationBootstrap);
+    }
 }
 exports.NestApplicationContext = NestApplicationContext;
diff --git a/bundle/core/nest-application.js b/bundle/core/nest-application.js
@@ -94,6 +94,7 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         await this.registerModules();
         await this.registerRouter();
         await this.callInitHook();
+        await this.callBootstrapHook();
         this.isInitialized = true;
         this.logger.log(constants_1.messages.APPLICATION_READY);
         return this;
diff --git a/bundle/core/pipes/pipes-consumer.js b/bundle/core/pipes/pipes-consumer.js
@@ -13,10 +13,7 @@ class PipesConsumer {
         return await transforms.reduce(async (defferedValue, fn) => {
             const val = await defferedValue;
             const result = fn(val, { metatype, type, data });
-            if (result instanceof Promise) {
-                return result;
-            }
-            return Promise.resolve(result);
+            return result;
         }, Promise.resolve(value));
     }
 }
diff --git a/bundle/core/router/router-response-controller.js b/bundle/core/router/router-response-controller.js
@@ -15,10 +15,7 @@ class RouterResponseController {
         this.applicationRef.render(response, template, result);
     }
     async transformToResult(resultOrDeffered) {
-        if (resultOrDeffered instanceof Promise) {
-            return await resultOrDeffered;
-        }
-        else if (resultOrDeffered && shared_utils_1.isFunction(resultOrDeffered.subscribe)) {
+        if (resultOrDeffered && shared_utils_1.isFunction(resultOrDeffered.subscribe)) {
             return await resultOrDeffered.toPromise();
         }
         return resultOrDeffered;
diff --git a/bundle/microservices/nest-microservice.js b/bundle/microservices/nest-microservice.js
@@ -47,7 +47,10 @@ class NestMicroservice extends nest_application_context_1.NestApplicationContext
         this.microservicesModule.setupClients(this.container);
         this.registerListeners();
         this.setIsInitialized(true);
-        !this.isInitHookCalled && (await this.callInitHook());
+        if (!this.isInitHookCalled) {
+            await this.callInitHook();
+            await this.callBootstrapHook();
+        }
     }
     registerListeners() {
         this.microservicesModule.setupListeners(this.container, this.server);
diff --git a/packages/common/index.ts b/packages/common/index.ts
@@ -31,6 +31,7 @@ export {
   NestInterceptor,
   NestMiddleware,
   NestModule,
+  OnApplicationBootstrap,
   OnModuleDestroy,
   OnModuleInit,
   Paramtype,
diff --git a/packages/common/interfaces/index.ts b/packages/common/interfaces/index.ts
@@ -1,33 +1,32 @@
-export * from './request-mapping-metadata.interface';
-export * from './modules/nest-module.interface';
-export * from './modules/module-metadata.interface';
-export * from './controllers/controller.interface';
-export * from './injectable.interface';
 export * from './controllers/controller-metadata.interface';
-export * from './modules/module-metadata.interface';
-export * from './type.interface';
-export * from './nest-application.interface';
-export * from './nest-microservice.interface';
-export * from './nest-application-context.interface';
-export * from './modules/on-init.interface';
-export * from './modules/on-destroy.interface';
+export * from './controllers/controller.interface';
 export * from './exceptions/exception-filter.interface';
-export * from './middleware';
-export * from './websockets/web-socket-adapter.interface';
-export * from './features/pipe-transform.interface';
-export * from './features/paramtype.interface';
-export * from './features/can-activate.interface';
 export * from './exceptions/rpc-exception-filter.interface';
 export * from './exceptions/ws-exception-filter.interface';
+export * from './features/arguments-host.interface';
+export * from './features/can-activate.interface';
+export * from './features/custom-route-param-factory.interface';
 export * from './features/execution-context.interface';
 export * from './features/nest-interceptor.interface';
-export * from './features/custom-route-param-factory.interface';
-export * from './modules/dynamic-module.interface';
-export * from './http/http-server.interface';
+export * from './features/paramtype.interface';
+export * from './features/pipe-transform.interface';
 export * from './http/http-server-factory.interface';
-export * from './features/arguments-host.interface';
+export * from './http/http-server.interface';
+export * from './injectable.interface';
+export * from './middleware';
+export * from './modules/dynamic-module.interface';
+export * from './modules/forward-reference.interface';
+export * from './modules/module-metadata.interface';
+export * from './modules/nest-module.interface';
+export * from './modules/on-destroy.interface';
+export * from './modules/on-init.interface';
+export * from './modules/provider.interface';
+export * from './nest-application-context.interface';
+export * from './nest-application.interface';
 export * from './nest-express-application.interface';
 export * from './nest-fastify-application.interface';
-export * from './modules/provider.interface';
+export * from './nest-microservice.interface';
+export * from './on-application-bootstrap.interface';
+export * from './request-mapping-metadata.interface';
 export * from './type.interface';
-export * from './modules/forward-reference.interface';
+export * from './websockets/web-socket-adapter.interface';
diff --git a/packages/common/interfaces/on-application-bootstrap.interface.ts b/packages/common/interfaces/on-application-bootstrap.interface.ts
@@ -0,0 +1,3 @@
+export interface OnApplicationBootstrap {
+  onApplicationBootstrap();
+}
diff --git a/packages/core/nest-application-context.ts b/packages/core/nest-application-context.ts
@@ -2,6 +2,7 @@ import {
   INestApplicationContext,
   Logger,
   LoggerService,
+  OnApplicationBootstrap,
   OnModuleDestroy,
   OnModuleInit,
 } from '@nestjs/common';
@@ -59,6 +60,7 @@ export class NestApplicationContext extends ModuleRef
 
   public async init(): Promise<this> {
     await this.callInitHook();
+    await this.callBootstrapHook();
     return this;
   }
 
@@ -135,4 +137,39 @@ export class NestApplicationContext extends ModuleRef
   protected hasOnModuleDestroyHook(instance): instance is OnModuleDestroy {
     return !isUndefined((instance as OnModuleDestroy).onModuleDestroy);
   }
+
+  protected async callBootstrapHook(): Promise<any> {
+    const modulesContainer = this.container.getModules();
+    for (const module of [...modulesContainer.values()].reverse()) {
+      await this.callModuleBootstrapHook(module);
+    }
+  }
+
+  protected async callModuleBootstrapHook(module: Module): Promise<any> {
+    const components = [...module.components];
+    const [_, { instance: moduleClassInstance }] = components.shift();
+    const instances = [...module.routes, ...components];
+
+    await Promise.all(
+      iterate(instances)
+        .map(([key, { instance }]) => instance)
+        .filter(instance => !isNil(instance))
+        .filter(this.hasOnModuleInitHook)
+        .map(
+          async instance =>
+            await (instance as OnApplicationBootstrap).onApplicationBootstrap(),
+        ),
+    );
+    if (moduleClassInstance && this.hasOnAppBotstrapHook(moduleClassInstance)) {
+      await (moduleClassInstance as OnApplicationBootstrap).onApplicationBootstrap();
+    }
+  }
+
+  protected hasOnAppBotstrapHook(
+    instance: any,
+  ): instance is OnApplicationBootstrap {
+    return !isUndefined(
+      (instance as OnApplicationBootstrap).onApplicationBootstrap,
+    );
+  }
 }
diff --git a/packages/core/nest-application.ts b/packages/core/nest-application.ts
@@ -148,6 +148,7 @@ export class NestApplication extends NestApplicationContext
     await this.registerModules();
     await this.registerRouter();
     await this.callInitHook();
+    await this.callBootstrapHook();
 
     this.isInitialized = true;
     this.logger.log(messages.APPLICATION_READY);
diff --git a/packages/microservices/nest-microservice.ts b/packages/microservices/nest-microservice.ts
@@ -77,7 +77,10 @@ export class NestMicroservice extends NestApplicationContext
     this.registerListeners();
     this.setIsInitialized(true);
 
-    !this.isInitHookCalled && (await this.callInitHook());
+    if (!this.isInitHookCalled) {
+      await this.callInitHook();
+      await this.callBootstrapHook();
+    }
   }
 
   public registerListeners() {
diff --git a/sample/12-graphql-apollo/src/app.module.ts b/sample/12-graphql-apollo/src/app.module.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export interface OnApplicationBootstrap {`
	`2`	`+ onApplicationBootstrap(): any;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+"use strict";`
	`2`	`+Object.defineProperty(exports, "__esModule", { value: true });`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export interface PlainLiteralObject {`
`5`	`5`	`[key: string]: any;`
`6`	`6`	`}`
`7`	`7`	`export declare class ClassSerializerInterceptor implements NestInterceptor {`
`8`		`- private readonly reflector;`
	`8`	`+ protected readonly reflector: any;`
`9`	`9`	`constructor(reflector: any);`
`10`	`10`	`intercept(context: ExecutionContext, call$: Observable<any>): Observable<any>;`
`11`	`11`	`serialize(response: PlainLiteralObject \| Array<PlainLiteralObject>, options: ClassTransformOptions): PlainLiteralObject \| PlainLiteralObject[];`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ class GuardsConsumer {`
`25`	`25`	`if (result instanceof rxjs_1.Observable) {`
`26`	`26`	`return await result.toPromise();`
`27`	`27`	`}`
`28`		`- if (result instanceof Promise) {`
`29`		`- return await result;`
`30`		`- }`
`31`	`28`	`return result;`
`32`	`29`	`}`
`33`	`30`	`}`