Merge pull request #110 from sparebytes/master

Fix transform of null primitive values

Author: cojack

src/TransformOperationExecutor.ts

@@ -57,12 +57,18 @@ export class TransformOperationExecutor {
             return newValue;
 
         } else if (targetType === String && !isMap) {
+            if (value === null || value === undefined)
+                return value;
             return String(value);
 
         } else if (targetType === Number && !isMap) {
+            if (value === null || value === undefined)
+                return value;
             return Number(value);
 
         } else if (targetType === Boolean && !isMap) {
+            if (value === null || value === undefined)
+                return value;
             return Boolean(value);
 
         } else if ((targetType === Date || value instanceof Date) && !isMap) {

test/functional/basic-functionality.spec.ts

@@ -507,6 +507,18 @@ describe("basic functionality", () => {
 
             @Type(type => String)
             lastVisitDate: string;
+
+            @Type(type => String)
+            nullableString?: null | string;
+
+            @Type(type => Number)
+            nullableNumber?: null | number;
+
+            @Type(type => Boolean)
+            nullableBoolean?: null | boolean;
+
+            @Type(type => Date)
+            nullableDate?: null | Date;
         }
 
         const date = new Date();
@@ -517,14 +529,22 @@ describe("basic functionality", () => {
         user.isActive = "1" as any;
         user.registrationDate = date.toString() as any;
         user.lastVisitDate = date as any;
+        user.nullableString = null as any;
+        user.nullableNumber = null as any;
+        user.nullableBoolean = null as any;
+        user.nullableDate = null as any;
 
         const fromPlainUser = {
             firstName: 321,
             lastName: 123,
             password: "123",
             isActive: "1",
             registrationDate: date.toString(),
-            lastVisitDate: date
+            lastVisitDate: date,
+            nullableString: null as null | string,
+            nullableNumber: null as null | string,
+            nullableBoolean: null as null | string,
+            nullableDate: null as null | string,
         };
 
         const fromExistUser = new User();
@@ -539,6 +559,10 @@ describe("basic functionality", () => {
             isActive: true,
             registrationDate: new Date(date.toString()),
             lastVisitDate: date.toString(),
+            nullableString: null,
+            nullableNumber: null,
+            nullableBoolean: null,
+            nullableDate: null,
         });
 
         const existUser = { id: 1, age: 27 };
@@ -553,6 +577,10 @@ describe("basic functionality", () => {
             isActive: true,
             registrationDate: new Date(date.toString()),
             lastVisitDate: date.toString(),
+            nullableString: null,
+            nullableNumber: null,
+            nullableBoolean: null,
+            nullableDate: null,
         });
         plainUser2.should.be.equal(existUser);
 
@@ -565,6 +593,10 @@ describe("basic functionality", () => {
             isActive: true,
             registrationDate: new Date(date.toString()),
             lastVisitDate: date.toString(),
+            nullableString: null,
+            nullableNumber: null,
+            nullableBoolean: null,
+            nullableDate: null,
         });
 
         const fromExistTransformedUser = plainToClassFromExist(fromExistUser, fromPlainUser, { strategy: "exposeAll" });
@@ -577,6 +609,10 @@ describe("basic functionality", () => {
             isActive: true,
             registrationDate: new Date(date.toString()),
             lastVisitDate: date.toString(),
+            nullableString: null,
+            nullableNumber: null,
+            nullableBoolean: null,
+            nullableDate: null,
         });
 
         const classToClassUser = classToClass(user, { strategy: "exposeAll" });
@@ -589,6 +625,10 @@ describe("basic functionality", () => {
             isActive: true,
             registrationDate: new Date(date.toString()),
             lastVisitDate: date.toString(),
+            nullableString: null,
+            nullableNumber: null,
+            nullableBoolean: null,
+            nullableDate: null,
         });
 
         const classToClassFromExistUser = classToClassFromExist(user, fromExistUser, { strategy: "exposeAll" });
@@ -603,6 +643,10 @@ describe("basic functionality", () => {
             isActive: true,
             registrationDate: new Date(date.toString()),
             lastVisitDate: date.toString(),
+            nullableString: null,
+            nullableNumber: null,
+            nullableBoolean: null,
+            nullableDate: null,
         });
     });
 
@@ -1694,4 +1738,4 @@ describe("basic functionality", () => {
         transformedClass.should.be.instanceOf(TestClass);
     });
 
-});
+});