Merge pull request nestjs#1166 from jbpionnier/refactor_remove_multiple_reflect_metadata

kamilmysliwiec · web-flow · commit 402d83ff9ec4 · 2018-10-05T14:42:20.000+02:00
refactor(common) remove multiple reflect metadata
diff --git a/package.json b/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",
diff --git a/packages/common/decorators/core/catch.decorator.ts b/packages/common/decorators/core/catch.decorator.ts
@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { FILTER_CATCH_EXCEPTIONS } from '../../constants';
 import { Type } from '../../interfaces';
 
diff --git a/packages/common/decorators/core/controller.decorator.ts b/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';
 
diff --git a/packages/common/decorators/core/dependencies.decorator.ts b/packages/common/decorators/core/dependencies.decorator.ts
@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { PARAMTYPES_METADATA } from '../../constants';
 
 export function flatten(arr: any[]) {
diff --git a/packages/common/decorators/core/exception-filters.decorator.ts b/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';
diff --git a/packages/common/decorators/core/inject.decorator.ts b/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';
 
diff --git a/packages/common/decorators/core/optional.decorator.ts b/packages/common/decorators/core/optional.decorator.ts
@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { OPTIONAL_DEPS_METADATA } from '../../constants';
 
 /**
diff --git a/packages/common/decorators/http/header.decorator.ts b/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';
 
diff --git a/packages/common/decorators/http/redirect.decorator.ts b/packages/common/decorators/http/redirect.decorator.ts
@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { REDIRECT_METADATA } from '../../constants';
 
 /**
diff --git a/packages/common/decorators/http/render.decorator.ts b/packages/common/decorators/http/render.decorator.ts
@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import { RENDER_METADATA } from '../../constants';
 
 /**
diff --git a/packages/common/decorators/http/request-mapping.decorator.ts b/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';
diff --git a/packages/common/decorators/http/route-params.decorator.ts b/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';
diff --git a/packages/common/decorators/modules/global.decorator.ts b/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.
diff --git a/packages/common/decorators/modules/module.decorator.ts b/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';
diff --git a/packages/common/decorators/modules/single-scope.decorator.ts b/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).
diff --git a/packages/common/index.ts b/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';
diff --git a/packages/common/test/decorators/catch.decorator.spec.ts b/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';
 
diff --git a/packages/common/test/decorators/component.decorator.spec.ts b/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';
 
diff --git a/packages/common/test/decorators/controller.decorator.spec.ts b/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';
 
diff --git a/packages/common/test/decorators/dependencies.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/exception-filters.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/global.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/header.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/http-code.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/inject.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/module.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/redirect.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/reflect-metadata.decorator.spec.ts b/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';
 
diff --git a/packages/common/test/decorators/render.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/request-mapping.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/route-params.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/use-guards.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/use-interceptors.decorator.spec.ts b/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';
diff --git a/packages/common/test/decorators/use-pipes.decorator.spec.ts b/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';
diff --git a/packages/common/test/utils/bind-resolve-values.util.spec.ts b/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';
diff --git a/packages/common/test/utils/merge-with-values.util.spec.ts b/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';
 
diff --git a/packages/common/utils/merge-with-values.util.ts b/packages/common/utils/merge-with-values.util.ts
@@ -1,5 +1,3 @@
-import 'reflect-metadata';
-
 export interface Constructor<T> {
   new (...args: any[]): T;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { FILTER_CATCH_EXCEPTIONS } from '../../constants';`
`3`	`2`	`import { Type } from '../../interfaces';`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { isUndefined } from '../../utils/shared.utils';`
`3`	`2`	`import { PATH_METADATA } from '../../constants';`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { PARAMTYPES_METADATA } from '../../constants';`
`3`	`2`
`4`	`3`	`export function flatten(arr: any[]) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { EXCEPTION_FILTERS_METADATA } from '../../constants';`
`3`	`2`	`import { ExceptionFilter } from '../../index';`
`4`	`3`	`import { extendArrayMetadata } from '../../utils/extend-metadata.util';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { SELF_DECLARED_DEPS_METADATA } from '../../constants';`
`3`	`2`	`import { isFunction } from '../../utils/shared.utils';`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { OPTIONAL_DEPS_METADATA } from '../../constants';`
`3`	`2`
`4`	`3`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { HEADERS_METADATA } from '../../constants';`
`3`	`2`	`import { extendArrayMetadata } from '../../utils/extend-metadata.util';`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { REDIRECT_METADATA } from '../../constants';`
`3`	`2`
`4`	`3`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'reflect-metadata';`
`2`	`1`	`import { RENDER_METADATA } from '../../constants';`
`3`	`2`
`4`	`3`	`/**`