Merge pull request #344 from livingspec/RDBC-661

Refactor createEmptyObject as a protected method to allow customization

Author: ml054

src/Mapping/ObjectMapper.ts

@@ -1,4 +1,4 @@
-import { ObjectTypeDescriptor, ClassConstructor, ObjectLiteralDescriptor, EntityConstructor } from "../Types";
+import { ObjectTypeDescriptor, ObjectLiteralDescriptor, EntityConstructor } from "../Types";
 import { throwError } from "../Exceptions";
 import { TypeUtil } from "../Utility/TypeUtil";
 import { getLogger } from "../Utility/LogUtil";
@@ -338,8 +338,7 @@ export class TypesAwareObjectMapper implements ITypesAwareObjectMapper {
         if (!ctorOrTypeDescriptor) {
             instance = Object.assign({}, rawValue);
         } else if (TypeUtil.isClass(ctorOrTypeDescriptor)) {
-            instance = this._createEmptyObject(ctorOrTypeDescriptor as ClassConstructor);
-            instance = Object.assign(instance, rawValue);
+            instance = this.createEmptyObject(ctorOrTypeDescriptor, rawValue);
         } else if (TypeUtil.isObjectLiteralTypeDescriptor(ctorOrTypeDescriptor)) {
             instance = (ctorOrTypeDescriptor as ObjectLiteralDescriptor).construct(rawValue);
         } else {
@@ -367,12 +366,12 @@ export class TypesAwareObjectMapper implements ITypesAwareObjectMapper {
         return ctorOrTypeDescriptor;
     }
 
-    private _createEmptyObject<TResult extends object>(ctor: EntityConstructor<TResult>) {
+    protected createEmptyObject<TResult extends object>(ctor: EntityConstructor<TResult>, rawValue: object) {
         if (!ctor) {
             throwError("InvalidArgumentException", "ctor argument must not be null or undefined.");
         }
 
-        return new ctor() as TResult;
+        return Object.assign(new ctor(), rawValue) as TResult;
     }
 
     private _makeObjectLiteral(

src/Utility/TypeUtil.ts

@@ -63,7 +63,7 @@ export class TypeUtil {
         return value === true || value === false;
     }
 
-    public static isClass(value: any): boolean {
+    public static isClass(value: any): value is ClassConstructor {
         return this.isFunction(value) && ("name" in value) && value.name !== ""
             && ("Object" !== value.name)
             && (!!value.prototype && !!value.prototype.constructor.name);