fix: Bad dependencies

tsedio · Feb 19, 2018 · 5fefd16 · 5fefd16
1 parent 4a5b266
commit 5fefd16
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 27 deletions.
diff --git a/src/common/jsonschema/index.ts b/src/common/jsonschema/index.ts
@@ -1,3 +1,5 @@
 export * from "./decorators";
 export * from "./class/JsonSchema";
+export * from "./class/PropertyMetadata";
+export * from "./registries/PropertyRegistry";
 export * from "./services/JsonSchemesService";
diff --git a/src/common/mvc/decorators/class/controller.ts b/src/common/mvc/decorators/class/controller.ts
@@ -1,5 +1,4 @@
 import {Type, isArrayOrArrayClass} from "@tsed/core";
-import {} from "../../../core/utils/index";
 import {IControllerOptions} from "../../interfaces/IControllerOptions";
 import {PathParamsType} from "../../interfaces/PathParamsType";
 import {ControllerRegistry} from "../../registries/ControllerRegistry";

diff --git a/src/multipartfiles/filters/MultipartFileFilter.ts b/src/multipartfiles/filters/MultipartFileFilter.ts
@@ -1,5 +1,5 @@
-import {Filter} from "../../common/filters/decorators/filter";
-import {IFilter} from "../../common/filters/interfaces";
+import {Filter, IFilter} from "@tsed/common";
+
 /**
  * @private
  * @filter

diff --git a/src/multipartfiles/filters/MultipartFilesFilter.ts b/src/multipartfiles/filters/MultipartFilesFilter.ts
@@ -1,5 +1,4 @@
-import {Filter} from "../../common/filters/decorators/filter";
-import {IFilter} from "../../common/filters/interfaces";
+import {Filter, IFilter} from "@tsed/common";
 
 /**
  * @private

diff --git a/src/multipartfiles/middlewares/MultipartFileMiddleware.ts b/src/multipartfiles/middlewares/MultipartFileMiddleware.ts
@@ -1,12 +1,14 @@
+import {
+    EndpointInfo,
+    EndpointMetadata,
+    IMiddleware,
+    Middleware,
+    Next,
+    Req,
+    Res,
+    ServerSettingsService
+} from "@tsed/common";
 import {$log} from "ts-log-debug";
-import {ServerSettingsService} from "../../common/config/services/ServerSettingsService";
-import {EndpointInfo} from "../../common/filters/decorators/endpointInfo";
-import {Next} from "../../common/filters/decorators/next";
-import {Req} from "../../common/filters/decorators/request";
-import {Res} from "../../common/filters/decorators/response";
-import {EndpointMetadata} from "../../common/mvc/class/EndpointMetadata";
-import {Middleware} from "../../common/mvc/decorators";
-import {IMiddleware} from "../../common/mvc/interfaces";
 
 /**
  * @private

diff --git a/src/swagger/class/OpenApiPropertiesBuilder.ts b/src/swagger/class/OpenApiPropertiesBuilder.ts
@@ -1,8 +1,6 @@
+import {JsonSchema, PropertyMetadata, PropertyRegistry} from "@tsed/common";
 import {deepExtends, nameOf, Storable, Store, Type} from "@tsed/core";
 import {Response, Schema} from "swagger-schema-official";
-import {JsonSchema} from "../../common/jsonschema/class/JsonSchema";
-import {PropertyMetadata} from "../../common/jsonschema/class/PropertyMetadata";
-import {PropertyRegistry} from "../../common/jsonschema/registries/PropertyRegistry";
 import {swaggerType} from "../utils";
 
 /**

diff --git a/src/swagger/decorators/description.ts b/src/swagger/decorators/description.ts
@@ -1,5 +1,5 @@
 import {getDecoratorType, Store} from "@tsed/core";
-import {Schema} from "../../common/jsonschema/decorators/schema";
+import {Schema} from "@tsed/common";
 import {BaseParameter} from "./baseParameter";
 import {Operation} from "./operation";
 

diff --git a/src/swagger/decorators/example.ts b/src/swagger/decorators/example.ts
@@ -1,4 +1,4 @@
-import {Schema} from "../../common/jsonschema/decorators/schema";
+import {Schema} from "@tsed/common";
 
 /**
  * Add a example metadata on the decorated element.

diff --git a/src/swagger/decorators/title.ts b/src/swagger/decorators/title.ts
@@ -1,5 +1,5 @@
 import {getDecoratorType} from "@tsed/core";
-import * as mod from "../../common/jsonschema/decorators/title";
+import * as mod from "@tsed/common";
 import {BaseParameter} from "./baseParameter";
 import {Operation} from "./operation";
 

diff --git a/src/testing/bootstrap.ts b/src/testing/bootstrap.ts
@@ -1,5 +1,5 @@
+import {ServerLoader} from "@tsed/common";
 import {$log} from "ts-log-debug";
-import {ServerLoader} from "../common/server/components/ServerLoader";
 
 /**
  * Load the server silently without listening port and configure it on test profile.

diff --git a/src/testing/inject.ts b/src/testing/inject.ts
@@ -1,4 +1,4 @@
-import {InjectorService} from "../common/di/services/InjectorService";
+import {InjectorService} from "@tsed/common";
 import {Done} from "./done";
 import {loadInjector} from "./loadInjector";
 

diff --git a/src/testing/invoke.ts b/src/testing/invoke.ts
@@ -1,5 +1,5 @@
+import {InjectorService} from "@tsed/common";
 import {Type} from "@tsed/core";
-import {InjectorService} from "../common/di/services/InjectorService";
 import {loadInjector} from "./loadInjector";
 
 export function invoke(target: Type<any>, providers: { provide: any | symbol, use: any }[]) {

diff --git a/src/testing/loadInjector.ts b/src/testing/loadInjector.ts
@@ -1,9 +1,5 @@
+import {ExpressApplication, globalServerSettings, HttpServer, HttpsServer, InjectorService} from "@tsed/common";
 import {Env} from "@tsed/core";
-import {globalServerSettings} from "../common/config";
-import {InjectorService} from "../common/di/services/InjectorService";
-import {ExpressApplication} from "../common/mvc/decorators";
-import {HttpServer} from "../common/server/decorators/httpServer";
-import {HttpsServer} from "../common/server/decorators/httpsServer";
 
 export function loadInjector() {
     if (!InjectorService.has(ExpressApplication)) {