Merge pull request #33 from artemln/master

Fix transform

Author: Umed Khudoiberdiev

src/TransformOperationExecutor.ts

@@ -158,8 +158,9 @@ export class TransformOperationExecutor {
                 }
 
                 if (!this.isCircular(subValue, level)) {
+                    let transformKey = this.transformationType === "plainToClass" ? newValueKey : key;
                     let finalValue = this.transform(subSource, subValue, type, arrayType, isSubValueMap, level + 1);
-                    finalValue = this.applyCustomTransformations(finalValue, targetType, key);
+                    finalValue = this.applyCustomTransformations(finalValue, targetType, transformKey);
                     if (newValue instanceof Map) {
                         newValue.set(newValueKey, finalValue);
                     } else {

test/functional/custom-transform.spec.ts

@@ -6,6 +6,24 @@ import * as moment from "moment";
 
 describe("custom transformation decorator", () => {
 
+    it("@Expose decorator with \"name\" option should work with @Transform decorator", () => {
+        defaultMetadataStorage.clear();
+
+        class User {
+
+            @Expose({name: "user_name"})
+            @Transform(value => value.toUpperCase())
+            name: string;
+        }
+
+        let plainUser = {
+            user_name: "Johny Cage"
+        };
+
+        const classedUser = plainToClass(User, plainUser);
+        classedUser.name.should.be.equal("JOHNY CAGE");
+    });
+
     it("@Transform decorator logic should be executed depend of toPlainOnly and toClassOnly set", () => {
         defaultMetadataStorage.clear();