Merge branch 'master' of https://github.com/nestjs/nest

integration/injector/e2e/default-values.spec.ts

@@ -0,0 +1,16 @@
+import { Test } from '@nestjs/testing';
+import { expect } from 'chai';
+import { DefaultsModule } from '../src/defaults/defaults.module';
+import { DefaultsService } from '../src/defaults/defaults.service';
+
+describe('Injector', () => {
+  describe('when optional', () => {
+    it(`should make use of default assignments`, async () => {
+      const builder = Test.createTestingModule({
+        imports: [DefaultsModule],
+      });
+      const app = await builder.compile();
+      expect(app.get(DefaultsService).coreService.default).to.be.true;
+    });
+  });
+});

integration/injector/src/defaults/core.service.ts

@@ -0,0 +1,4 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class CoreService {}

integration/injector/src/defaults/defaults.module.ts

@@ -0,0 +1,7 @@
+import { Module } from '@nestjs/common';
+import { DefaultsService } from './defaults.service';
+
+@Module({
+  providers: [DefaultsService],
+})
+export class DefaultsModule {}

integration/injector/src/defaults/defaults.service.ts

@@ -0,0 +1,11 @@
+import { Inject, Injectable, Optional } from '@nestjs/common';
+import { CoreService } from './core.service';
+
+@Injectable()
+export class DefaultsService {
+  constructor(
+    @Inject(CoreService)
+    @Optional()
+    public readonly coreService = { default: true },
+  ) {}
+}

package.json

@@ -5,8 +5,8 @@
   "scripts": {
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "precommit": "lint-staged",
-    "test": "nyc --require ts-node/register mocha packages/**/*.spec.ts --reporter spec",
-    "integration-test": "mocha integration/**/*.spec.ts --reporter spec --require ts-node/register",
+    "test": "nyc --require ts-node/register mocha packages/**/*.spec.ts --reporter spec --require 'node_modules/reflect-metadata/Reflect.js'",
+    "integration-test": "mocha integration/**/*.spec.ts --reporter spec --require ts-node/register --require 'node_modules/reflect-metadata/Reflect.js'",
     "lint": "tslint -p tsconfig.json -c tslint.json \"packages/**/*.ts\" -e \"*.spec.ts\"",
     "format": "prettier **/**/*.ts --ignore-path ./.prettierignore --write && git status",
     "build": "gulp build && gulp move",

packages/common/decorators/core/catch.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { FILTER_CATCH_EXCEPTIONS } from '../../constants';
 import { Type } from '../../interfaces';
 

packages/common/decorators/core/controller.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { isUndefined } from '../../utils/shared.utils';
 import { PATH_METADATA } from '../../constants';
 

packages/common/decorators/core/dependencies.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { PARAMTYPES_METADATA } from '../../constants';
 
 export function flatten(arr: any[]) {

packages/common/decorators/core/exception-filters.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { EXCEPTION_FILTERS_METADATA } from '../../constants';
 import { ExceptionFilter } from '../../index';
 import { extendArrayMetadata } from '../../utils/extend-metadata.util';

packages/common/decorators/core/inject.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { SELF_DECLARED_DEPS_METADATA } from '../../constants';
 import { isFunction } from '../../utils/shared.utils';
 

packages/common/decorators/core/optional.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { OPTIONAL_DEPS_METADATA } from '../../constants';
 
 /**

packages/common/decorators/http/header.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { HEADERS_METADATA } from '../../constants';
 import { extendArrayMetadata } from '../../utils/extend-metadata.util';
 

packages/common/decorators/http/redirect.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { REDIRECT_METADATA } from '../../constants';
 
 /**

packages/common/decorators/http/render.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { RENDER_METADATA } from '../../constants';
 
 /**

packages/common/decorators/http/request-mapping.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { RequestMappingMetadata } from '../../interfaces/request-mapping-metadata.interface';
 import { RequestMethod } from '../../enums/request-method.enum';
 import { PATH_METADATA, METHOD_METADATA } from '../../constants';

packages/common/decorators/http/route-params.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { ROUTE_ARGS_METADATA } from '../../constants';
 import { RouteParamtypes } from '../../enums/route-paramtypes.enum';
 import { PipeTransform } from '../../index';

packages/common/decorators/modules/global.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { GLOBAL_MODULE_METADATA } from '../../constants';
 /**
  * Makes the module global-scoped.

packages/common/decorators/modules/module.decorator.ts

@@ -1,5 +1,4 @@
 import * as deprecate from 'deprecate';
-import 'reflect-metadata';
 import { METADATA as metadataConstants } from '../../constants';
 import { ModuleMetadata } from '../../interfaces/modules/module-metadata.interface';
 import { InvalidModuleConfigException } from './exceptions/invalid-module-config.exception';

packages/common/decorators/modules/single-scope.decorator.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { SHARED_MODULE_METADATA } from '../../constants';
 /**
  * Makes the module single-scoped (not singleton).

packages/common/index.ts

@@ -4,7 +4,7 @@
  * https://nestjs.com
  * MIT Licensed
  */
-
+import 'reflect-metadata';
 export * from './cache';
 export * from './decorators';
 export * from './enums';

packages/common/test/decorators/catch.decorator.spec.ts

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import 'reflect-metadata';
 import { FILTER_CATCH_EXCEPTIONS } from '../../constants';
 import { Catch } from '../../decorators/core/catch.decorator';
 

packages/common/test/decorators/component.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Component, MiddlewareFunction, Interceptor, mixin, Injectable } from '../../index';
 

packages/common/test/decorators/controller.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Controller } from '../../decorators/core/controller.decorator';
 

packages/common/test/decorators/dependencies.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Dependencies } from '../../decorators/core/dependencies.decorator';
 import { PARAMTYPES_METADATA } from '../../constants';

packages/common/test/decorators/exception-filters.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { EXCEPTION_FILTERS_METADATA } from '../../constants';
 import { UseFilters } from '../../decorators/core/exception-filters.decorator';

packages/common/test/decorators/global.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { GLOBAL_MODULE_METADATA } from '../../constants';
 import { Global } from '../../index';

packages/common/test/decorators/header.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Header } from '../../decorators/http';
 import { HEADERS_METADATA } from '../../constants';

packages/common/test/decorators/http-code.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { HttpCode } from '../../decorators/http/http-code.decorator';
 import { HTTP_CODE_METADATA } from '../../constants';

packages/common/test/decorators/inject.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { SELF_DECLARED_DEPS_METADATA } from '../../constants';
 import { Inject } from '../../index';

packages/common/test/decorators/module.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Module } from '../../decorators/modules/module.decorator';
 import { InvalidModuleConfigException } from '../../decorators/modules/exceptions/invalid-module-config.exception';

packages/common/test/decorators/redirect.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Redirect } from '../../decorators/http/redirect.decorator';
 import { REDIRECT_METADATA } from '../../constants';

packages/common/test/decorators/reflect-metadata.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { ReflectMetadata } from '../../decorators/core/reflect-metadata.decorator';
 

packages/common/test/decorators/render.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { Render } from '../../decorators/http/render.decorator';
 import { RENDER_METADATA } from '../../constants';

packages/common/test/decorators/request-mapping.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { RequestMapping } from '../../decorators/http/request-mapping.decorator';
 import { RequestMethod } from '../../enums/request-method.enum';

packages/common/test/decorators/route-params.decorator.spec.ts

@@ -1,6 +1,5 @@
 import { Param } from '@nestjs/common';
 import { expect } from 'chai';
-import 'reflect-metadata';
 import { Body, Query } from '../../decorators';
 import { RequestMethod } from '../../enums/request-method.enum';
 import { All, Delete, Get, Patch, Post, Put } from '../../index';

packages/common/test/decorators/use-guards.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { UseGuards } from '../../decorators/core/use-guards.decorator';
 import { GUARDS_METADATA } from '../../constants';

packages/common/test/decorators/use-interceptors.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { UseInterceptors } from '../../decorators/core/use-interceptors.decorator';
 import { INTERCEPTORS_METADATA } from '../../constants';

packages/common/test/decorators/use-pipes.decorator.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { UsePipes } from '../../decorators/core/use-pipes.decorator';
 import { PIPES_METADATA } from '../../constants';

packages/common/test/utils/bind-resolve-values.util.spec.ts

@@ -1,5 +1,4 @@
 import 'mocha';
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { BindResolveMiddlewareValues } from '../../utils/bind-resolve-values.util';
 import { NestMiddleware } from '../../interfaces/middleware/nest-middleware.interface';

packages/common/test/utils/merge-with-values.util.spec.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { expect } from 'chai';
 import { MergeWithValues } from '../../utils/merge-with-values.util';
 

packages/common/utils/merge-with-values.util.ts

@@ -1,5 +1,3 @@
-import 'reflect-metadata';
-
 export interface Constructor<T> {
   new (...args: any[]): T;
 }

packages/core/injector/injector.ts

@@ -178,7 +178,7 @@ export class Injector {
           if (!isOptional) {
             throw err;
           }
-          return null;
+          return undefined;
         }
       }),
     );

packages/websockets/adapters/ws-adapter.ts

@@ -97,6 +97,7 @@ export class WsAdapter implements WebSocketAdapter {
   }
 
   public bindErrorHandler(server) {
+    server.on(CONNECTION_EVENT, ws => ws.on(ERROR_EVENT, err => this.logger.error(err)));
     server.on(ERROR_EVENT, err => this.logger.error(err));
     return server;
   }

packages/websockets/gateway-metadata-explorer.ts

@@ -1,12 +1,17 @@
-import { NestGateway } from './interfaces/nest-gateway.interface';
-import { isUndefined, isFunction } from '@nestjs/common/utils/shared.utils';
+import { isFunction, isUndefined } from '@nestjs/common/utils/shared.utils';
+import { MetadataScanner } from '@nestjs/core/metadata-scanner';
+import { Observable } from 'rxjs';
 import {
+  GATEWAY_SERVER_METADATA,
   MESSAGE_MAPPING_METADATA,
   MESSAGE_METADATA,
-  GATEWAY_SERVER_METADATA,
 } from './constants';
-import { MetadataScanner } from '@nestjs/core/metadata-scanner';
-import { Observable } from 'rxjs';
+import { NestGateway } from './interfaces/nest-gateway.interface';
+
+export interface MessageMappingProperties {
+  message: any;
+  callback: (...args) => Observable<any> | Promise<any> | any;
+}
 
 export class GatewayMetadataExplorer {
   constructor(private readonly metadataScanner: MetadataScanner) {}
@@ -42,22 +47,18 @@ export class GatewayMetadataExplorer {
 
   public *scanForServerHooks(instance: NestGateway): IterableIterator<string> {
     for (const propertyKey in instance) {
-      if (isFunction(propertyKey)) continue;
-
+      if (isFunction(propertyKey)) {
+        continue;
+      }
       const property = String(propertyKey);
       const isServer = Reflect.getMetadata(
         GATEWAY_SERVER_METADATA,
         instance,
         property,
       );
-      if (isUndefined(isServer)) continue;
-
-      yield property;
+      if (!isUndefined(isServer)) {
+        yield property;
+      }
     }
   }
 }
-
-export interface MessageMappingProperties {
-  message: any;
-  callback: (...args) => Observable<any> | Promise<any> | any;
-}

packages/websockets/interfaces/hooks/index.ts

@@ -0,0 +1,3 @@
+export * from './on-gateway-connection.interface';
+export * from './on-gateway-disconnect.interface';
+export * from './on-gateway-init.interface';

packages/websockets/interfaces/index.ts

@@ -1,9 +1,5 @@
 export * from './gateway-metadata.interface';
-export * from './nest-gateway.interface';
+export * from './hooks';
 export * from './observable-socket-server.interface';
 export * from './web-socket-server.interface';
-export * from './on-gateway-init.interface';
-export * from './on-gateway-connection.interface';
-export * from './on-gateway-disconnect.interface';
-export * from './gateway-middleware.interface';
 export * from './ws-response.interface';

packages/websockets/interfaces/observable-socket-server.interface.ts

@@ -1,8 +1,8 @@
 import { ReplaySubject, Subject } from 'rxjs';
 
-export interface ObservableSocketServer {
-  server: any;
-  init: ReplaySubject<any>;
+export interface ObservableSocketServer<T = any> {
+  server: T;
+  init: ReplaySubject<T>;
   connection: Subject<any>;
   disconnect: Subject<any>;
 }

packages/websockets/interfaces/web-socket-server.interface.ts

@@ -1,4 +1,4 @@
-export interface WebSocketServerData {
+export interface WebSocketServerOptions {
   port: number;
   namespace: string;
 }