ConversionTypeEnum.String now coverts objects with JSON.stringify.

Author: Robert S

README.md

@@ -318,6 +318,8 @@ export default class CarModel extends BaseModel {
 
 ## Release History
 
+-   2019-01-28 v1.8.2 ConversionTypeEnum.String now coverts objects with JSON.stringify.
+
 -   2019-01-28 v1.8.1 Returns the original data for ConversionTypeEnum.JSON if parse fails.
 
 -   2019-01-17 v1.8.0 Fix issue with webpack builds.

__tests__/Util.test.ts

@@ -98,6 +98,7 @@ describe('Util', () => {
         expect(Util.convertDataToConversionType(1.11, ConversionTypeEnum.String)).toEqual('1.11');
         expect(Util.convertDataToConversionType(false, ConversionTypeEnum.String)).toEqual('false');
         expect(Util.convertDataToConversionType(null, ConversionTypeEnum.String)).toEqual(null);
+        expect(Util.convertDataToConversionType(json, ConversionTypeEnum.String)).toEqual(JSON.stringify(json));
         expect(Util.convertDataToConversionType('1.11', ConversionTypeEnum.String)).toEqual('1.11'); // should return same
 
         expect(Util.convertDataToConversionType(JSON.stringify(json), ConversionTypeEnum.JSON)).toEqual(json);
@@ -150,4 +151,21 @@ describe('Util', () => {
             }).toThrow(SyntaxError);
         });
     });
+
+    test('Util.isObject', () => {
+        expect(Util.isObject(undefined)).toBeFalsy();
+        expect(Util.isObject(null)).toBeFalsy();
+        expect(Util.isObject(1)).toBeFalsy();
+        expect(Util.isObject('string')).toBeFalsy();
+        expect(Util.isObject([])).toBeFalsy();
+
+        expect(Util.isObject({})).toBeTruthy();
+        expect(Util.isObject(json)).toBeTruthy();
+    });
+
+    test('Util.isObjectWithProperties', () => {
+        expect(Util.isObjectWithProperties({})).toBeFalsy();
+
+        expect(Util.isObjectWithProperties(json)).toBeTruthy();
+    });
 });

src/BaseModel.ts

@@ -241,7 +241,7 @@ export class BaseModel extends BaseObject implements IBaseModel {
     protected _updateData(currentPropertyData: any, passedInDataForProperty: any): any {
         const isBaseModelObject: boolean = this._isBaseModelObject(currentPropertyData);
         const isBaseModelClass: boolean = this._isBaseModelClass(currentPropertyData);
-        const isPassedInDataAnObjectWithProperties: boolean = this._isObjectWithProperties(passedInDataForProperty);
+        const isPassedInDataAnObjectWithProperties: boolean = Util.isObjectWithProperties(passedInDataForProperty);
 
         if (isBaseModelObject === true && isPassedInDataAnObjectWithProperties === true) {
             // Call the update method on th BaseModel object and give it the passed in data.
@@ -291,28 +291,11 @@ export class BaseModel extends BaseObject implements IBaseModel {
         return currentPropertyData instanceof BaseModel;
     }
 
-    /**
-     * Check the data is an object with properties.
-     *
-     * @method _isObjectWithProperties
-     * @param data
-     * @returns {boolean}
-     * @protected
-     */
-    protected _isObjectWithProperties(data: any): boolean {
-        return this._isObject(data) && Object.keys(data).length > 0;
-    }
-
     /**
      * Check if the data is an object.
-     *
-     * @method _isObject
-     * @param data
-     * @returns {boolean}
-     * @protected
      */
     protected _isObject(data: any, consoleError: boolean = false): boolean {
-        const isObject: boolean = Boolean(data) && Array.isArray(data) === false && typeof data === 'object';
+        const isObject: boolean = Util.isObject(data);
 
         if (isObject === false && consoleError === true) {
             console.error(`Something is wrong! ${this.getClassName()} only allows Objects but "${data}" was passed in.`);

src/Util.ts

@@ -169,6 +169,10 @@ export class Util {
             case ConversionTypeEnum.Number:
                 return propertyData === null ? null : parseInt(propertyData as string, 10);
             case ConversionTypeEnum.String:
+                if (Util.isObject(propertyData)) {
+                    return JSON.stringify(propertyData);
+                }
+
                 return propertyData === null ? null : String(propertyData);
             case ConversionTypeEnum.JSON:
                 try {
@@ -180,4 +184,18 @@ export class Util {
                 return propertyData;
         }
     }
+
+    /**
+     * Check the data is an object with properties.
+     */
+    public static isObjectWithProperties(data: any): boolean {
+        return Util.isObject(data) && Object.keys(data).length > 0;
+    }
+
+    /**
+     * Check if the data is an object.
+     */
+    public static isObject(data: any): boolean {
+        return Boolean(data) && Array.isArray(data) === false && typeof data === 'object';
+    }
 }