fix(common): Fix problem with port configuration

Closes: #632

Author: Romakita

integration/getting-started/src/Server.ts

@@ -8,10 +8,6 @@ const compress = require("compression");
 const methodOverride = require("method-override");
 const rootDir = __dirname;
 
-const config: IServerSettings = {
-  swagger: {}
-};
-
 @ServerSettings({
   rootDir,
   acceptMimes: ["application/json"],
@@ -28,9 +24,7 @@ const config: IServerSettings = {
   },
   calendar: {
     token: true
-  },
-  debug: true,
-  swagger: {}
+  }
 })
 export class Server extends ServerLoader {
   constructor(settings) {

packages/common/src/config/services/ServerSettingsService.ts

@@ -58,6 +58,10 @@ export class ServerSettingsService extends DIConfiguration {
     this.map.set("rootDir", value);
   }
 
+  get port(): string | number {
+    return this.httpPort;
+  }
+
   set port(value: string | number) {
     this.httpPort = value;
   }

packages/common/src/server/decorators/serverSettings.ts

@@ -1,5 +1,5 @@
 import {StoreSet} from "@tsed/core";
-import {IServerSettings} from "../../config/interfaces/IServerSettings";
+import {IDIConfigurationOptions} from "@tsed/di";
 
 /**
  * `@ServerSettings` let you to configure quickly your server via decorator. This decorator take your configuration and merge it with the default server configuration.
@@ -49,6 +49,6 @@ import {IServerSettings} from "../../config/interfaces/IServerSettings";
  * @returns {(target:any)=>any}
  * @decorator
  */
-export function ServerSettings(settings: Partial<IServerSettings>): Function {
+export function ServerSettings(settings: Partial<IDIConfigurationOptions>): Function {
   return StoreSet("PLATFORM_SETTINGS", settings);
 }

packages/common/test/config/services/ServerSettingsService.spec.ts

@@ -178,6 +178,17 @@ describe("ServerSettingsService", () => {
       });
     });
 
+    describe("port", () => {
+      it("should set port", () => {
+        const settings = new ServerSettingsService();
+
+        settings.set({port: 8081});
+
+        expect(settings.httpPort).to.eq(8081);
+        expect(settings.port).to.eq(8081);
+      });
+    });
+
     describe("resolve()", () => {
       it("should replace rootDir", () => {
         expect(settings.resolve("${rootDir}")).to.eq(process.cwd());

packages/di/src/services/DIConfiguration.ts

@@ -82,15 +82,7 @@ export class DIConfiguration {
     if (typeof propertyKey === "string") {
       setValue(propertyKey, value, this.map);
     } else {
-      Object.entries(propertyKey).forEach(([key, value]) => {
-        const descriptor = Object.getOwnPropertyDescriptor(DIConfiguration.prototype, key);
-
-        if (descriptor && ["set", "map", "get"].indexOf(key) === -1) {
-          this[key] = value;
-        } else {
-          this.set(key, value);
-        }
-      });
+      Object.assign(this, propertyKey);
     }
 
     return this;