fable 3.0.67 → 3.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.67",
+    "version": "3.0.69",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -58,7 +58,7 @@
         "cookie": "^0.5.0",
         "data-arithmatic": "^1.0.7",
         "fable-log": "^3.0.10",
-        "fable-serviceproviderbase": "^3.0.8",
+        "fable-serviceproviderbase": "^3.0.10",
         "fable-settings": "^3.0.6",
         "fable-uuid": "^3.0.5",
         "manyfest": "^1.0.25",

package/source/services/Fable-Service-Utility.js

@@ -35,10 +35,13 @@ class FableServiceUtility extends libFableServiceBase
 		for (let i = 0; i < pSourceObjects.length; i++)
 		{
 			let tmpSourceObject = pSourceObjects[i];
-			let tmpObjectProperties = Object.keys(tmpSourceObject);
-			for (let k = 0; k < tmpObjectProperties.length; k++)
+			if (typeof(tmpSourceObject) === 'object')
 			{
-				pDestinationObject[tmpObjectProperties[k]] = tmpSourceObject[tmpObjectProperties[k]];
+				let tmpObjectProperties = Object.keys(tmpSourceObject);
+				for (let k = 0; k < tmpObjectProperties.length; k++)
+				{
+					pDestinationObject[tmpObjectProperties[k]] = tmpSourceObject[tmpObjectProperties[k]];
+				}
 			}
 		}
 		return pDestinationObject;

package/test/Utility_tests.js

@@ -132,6 +132,20 @@ suite
 					}
 				);
 				test
+				(
+					'merging objects should not fail with undefined or nulls',
+					function()
+					{
+						testFable = new libFable();
+						let tmpResult = testFable.services.Utility.extend({SomeValue:'here',Size:10},{Color:'Red',Size:20},undefined);
+						Expect(tmpResult).to.have.a.property('SomeValue')
+							.that.is.a('string');
+						Expect(tmpResult.SomeValue).to.equal('here');
+						Expect(tmpResult.Color).to.equal('Red');
+						Expect(tmpResult.Size).to.equal(20);
+					}
+				);
+				test
 				(
 					'merging objects should work like old underscore did with more paramters',
 					function()