Merge fix-781-multer-options

tsedio · Mar 30, 2020 · 32a1e54 · 32a1e54
2 parents a75121c + ab72c27
commit 32a1e54
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/packages/common/src/config/services/ServerSettingsService.spec.ts b/packages/common/src/config/services/ServerSettingsService.spec.ts
@@ -1,7 +1,7 @@
 import {Env} from "@tsed/core";
+import {$log} from "@tsed/logger";
 import {expect} from "chai";
 import * as Sinon from "sinon";
-import {$log} from "@tsed/logger";
 import {ProviderScope, ProviderType} from "../../../../di/src/interfaces";
 import {ServerSettingsService} from "../../../src/config/services/ServerSettingsService";
 
@@ -197,6 +197,23 @@ describe("ServerSettingsService", () => {
         expect(settings.resolve("${rootDir}")).to.eq(process.cwd());
       });
 
+      it("should preserve class", () => {
+        class Storage {
+          static _path = "${rootDir}";
+        }
+
+        const store = new Storage();
+        const result = settings.resolve({
+          path: "${rootDir}",
+          storage: store
+        });
+
+        expect(result).to.deep.eq({
+          path: process.cwd(),
+          storage: new Storage()
+        });
+      });
+
       it("should replace rootDir", () => {
         expect(settings.resolve({other: null, resolve: "${rootDir}"})).to.deep.eq({
           other: null,

diff --git a/packages/di/src/services/DIConfiguration.ts b/packages/di/src/services/DIConfiguration.ts
@@ -1,4 +1,4 @@
-import {deepExtends, getValue, setValue} from "@tsed/core";
+import {classOf, deepExtends, getValue, setValue} from "@tsed/core";
 import {IDIConfigurationOptions} from "../interfaces/IDIConfigurationOptions";
 import {ProviderScope} from "../interfaces/ProviderScope";
 
@@ -89,7 +89,9 @@ export class DIConfiguration {
     if (typeof propertyKey === "string") {
       this.setRaw(propertyKey, value);
     } else {
-      Object.assign(this, propertyKey);
+      Object.entries(propertyKey).forEach(([key, value]) => {
+        this[key] = value;
+      });
     }
 
     return this;
@@ -139,6 +141,10 @@ export class DIConfiguration {
    */
   resolve(value: any) {
     if (typeof value === "object" && value !== null) {
+      if (![Array, Object].includes(classOf(value))) {
+        return value;
+      }
+
       return Object.entries(value).reduce(
         (o, [k, v]) => {
           // @ts-ignore