Merge pull request #100 from tbreug/patch-1

Update MetadataStorage.ts

Author: pleerock

src/metadata/MetadataStorage.ts

@@ -146,19 +146,19 @@ export class MetadataStorage {
 
     private getMetadata<T extends { target: Function, propertyName: string }>(metadatas: T[], target: Function): T[] {
         const metadataFromTarget = metadatas.filter(meta => meta.target === target && meta.propertyName !== undefined);
-        const metadataFromChildren = metadatas.filter(meta => target.prototype instanceof meta.target && meta.propertyName !== undefined);
+        const metadataFromChildren = metadatas.filter(meta => target && target.prototype instanceof meta.target && meta.propertyName !== undefined);
         return metadataFromChildren.concat(metadataFromTarget);
     }
 
     private findMetadata<T extends { target: Function, propertyName: string }>(metadatas: T[], target: Function, propertyName: string): T {
         const metadataFromTarget = metadatas.find(meta => meta.target === target && meta.propertyName === propertyName);
-        const metadataFromChildren = metadatas.find(meta => target.prototype instanceof meta.target && meta.propertyName === propertyName);
+        const metadataFromChildren = metadatas.find(meta => target && target.prototype instanceof meta.target && meta.propertyName === propertyName);
         return metadataFromTarget || metadataFromChildren;
     }
 
     private findMetadatas<T extends { target: Function, propertyName: string }>(metadatas: T[], target: Function, propertyName: string): T[] {
         const metadataFromTarget = metadatas.filter(meta => meta.target === target && meta.propertyName === propertyName);
-        const metadataFromChildren = metadatas.filter(meta => target.prototype instanceof meta.target && meta.propertyName === propertyName);
+        const metadataFromChildren = metadatas.filter(meta => target && target.prototype instanceof meta.target && meta.propertyName === propertyName);
         return metadataFromChildren.reverse().concat(metadataFromTarget.reverse());
     }
 

test/functional/custom-transform.spec.ts

@@ -1,4 +1,5 @@
 import "reflect-metadata";
+import {expect} from "chai";
 import {classToPlain, plainToClass} from "../../src/index";
 import {defaultMetadataStorage} from "../../src/storage";
 import {Expose, Transform, Type} from "../../src/decorators";
@@ -157,5 +158,63 @@ describe("custom transformation decorator", () => {
         objArg.should.be.equal(user);
         typeArg.should.be.equal(TransformationType.CLASS_TO_PLAIN);
     });
+    
+    let model: any;
+    it ("should serialize json into model instance of class Person", () => {
+        expect(() => {
+            const json = {
+                name: "John Doe",
+                address: {
+                    street: "Main Street 25",
+                    tel: "5454-534-645",
+                    zip: 10353,
+                    country: "West Samoa"
+                },
+                age: 25,
+                hobbies: [
+                    { type: "sport", name: "sailing" },
+                    { type: "relax", name: "reading" },
+                    { type: "sport", name: "jogging" },
+                    { type: "relax", name: "movies"  }
+                ]
+            };
+            class Hobby {
+                public type: string;
+                public name: string;
+            }
+            class Address {
+                public street: string;
+                
+                @Expose({ name: "tel" }) 
+                public telephone: string;
+                
+                public zip: number;
+                
+                public country: string;
+            }
+            class Person {
+                public name: string;
+                
+                @Type(() => Address)
+                public address: Address;
+                
+                @Type(() => Hobby)
+                @Transform(value => value.filter((hobby: any) => hobby.type === "sport"), { toClassOnly: true })
+                public hobbies: Hobby[];
+                
+                public age: number;
+            }
+            model = plainToClass(Person, json);
+            expect(model instanceof Person);
+            expect(model.address instanceof Address);
+            model.hobbies.forEach((hobby: Hobby) => expect(hobby instanceof Hobby && hobby.type === "sport"));
+        }).to.not.throw();
+    });
+    
+    it ("should serialize a model into json", () => {
+        expect(() => {
+            classToPlain(model);
+        }).to.not.throw();
+    });
 
 });