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

Author: kamilmysliwiec

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';