fable 3.1.30 → 3.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.30",
+  "version": "3.1.31",
   "description": "A service dependency injection, configuration and logging library.",
   "main": "source/Fable.js",
   "scripts": {

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json

@@ -161,6 +161,10 @@
 		"Name": "Get Array of an Object's values",
 		"Address": "fable.Utility.objectValuesToArray"
 	},
+	"generatearrayofobjectsfromsets": {
+		"Name": "Generate Array of Objects from Sets",
+		"Address": "fable.Utility.generateArrayOfObjectsFromSets"
+	},
 	"objectvaluessortbyexternalobjectarray": {
 		"Name": "Get Array of an Object's values sorted by an external array",
 		"Address": "fable.Utility.objectValuesSortByExternalArray"

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

@@ -308,6 +308,10 @@ class FableServiceUtility extends libFableServiceBase
 	// Convert object values to an array of values
 	objectValuesToArray(pObject)
 	{
+		if ((typeof(pObject) !== 'object') || (pObject === null))
+		{
+			return [];
+		}
 		let tmpKeys = Object.keys(pObject);
 		let tmpValues = [];
 
@@ -551,6 +555,54 @@ class FableServiceUtility extends libFableServiceBase
 		return pInputArray.flatMap(tmpArrayFlattener);
 	}
 
+	generateArrayOfObjectsFromSets()
+	{
+		// For each argument pair, map data to an array of objects with the first parameter of the pairs as the property name and the second parameter as the array of values
+		let tmpResultArray = [];
+		if (arguments.length % 2 != 0)
+		{
+			// Must be pairs
+			return tmpResultArray;
+		}
+
+		let tmpPropertyNames = [];
+		let tmpValueArrays = [];
+
+		for (let i = 0; i < arguments.length; i += 2)
+		{
+			tmpPropertyNames.push(arguments[i]);
+			tmpValueArrays.push(this.objectValuesToArray(arguments[i + 1]));
+		}
+
+		for (let h = 0; h < tmpValueArrays.length; h++)
+		{
+			let tmpValueArray = tmpValueArrays[h];
+			let tmpPropertyName = tmpPropertyNames[h];
+			if (!Array.isArray(tmpValueArray))
+			{
+				continue;
+			}
+			for (let i = 0; i < tmpValueArray.length; i++)
+			{
+				if (tmpResultArray.length <= i)
+				{
+					tmpResultArray.push({});
+				}
+
+				let tmpObject = tmpResultArray[i];
+				if (!tmpObject)
+				{
+					// This shouldn't be possible
+					continue;
+				}
+
+				tmpObject[tmpPropertyName] = tmpValueArray[i];
+			}
+		}
+
+		return tmpResultArray;
+	}
+
 	/**
 	 * Take a set of arbitrary parameters and build an array from them
 	 * @returns {Array} - An array built from the absolute values of the parameters

package/test/Utility_tests.js

@@ -70,6 +70,54 @@ suite
 						Expect(tmpInternalValueArray[3]).to.equal(undefined);
 						Expect(tmpInternalValueArray[4]).to.equal(6.75);
 
+						let tmpTestObject1 = {'a': 1, 'b': 2, 'c': 3};
+						let tmpTestObject2 = {'d': 4, 'e': 5, 'f': 6};
+						let tmpTestObject3 = {'g': 7, 'h': 8};
+						let tmpObjectCoordinateMap = testFable.services.Utility.generateArrayOfObjectsFromSets('x', tmpTestObject1, 'y', tmpTestObject2);
+						Expect(tmpObjectCoordinateMap).to.be.an('array');
+						Expect(tmpObjectCoordinateMap.length).to.equal(3);
+						Expect(tmpObjectCoordinateMap[0]).to.have.property('x').that.equals(1);
+						Expect(tmpObjectCoordinateMap[0]).to.have.property('y').that.equals(4);
+						Expect(tmpObjectCoordinateMap[1]).to.have.property('x').that.equals(2);
+						Expect(tmpObjectCoordinateMap[1]).to.have.property('y').that.equals(5);
+						Expect(tmpObjectCoordinateMap[2]).to.have.property('x').that.equals(3);
+						Expect(tmpObjectCoordinateMap[2]).to.have.property('y').that.equals(6);
+
+						let tmpObjectCoordinateMapBadSet = testFable.services.Utility.generateArrayOfObjectsFromSets('x', tmpTestObject1, 'y', tmpTestObject2, 'z', null);
+						Expect(tmpObjectCoordinateMap).to.be.an('array');
+						Expect(tmpObjectCoordinateMap.length).to.equal(3);
+						Expect(tmpObjectCoordinateMap[0]).to.have.property('x').that.equals(1);
+						Expect(tmpObjectCoordinateMap[0]).to.have.property('y').that.equals(4);
+						Expect(tmpObjectCoordinateMap[1]).to.have.property('x').that.equals(2);
+						Expect(tmpObjectCoordinateMap[1]).to.have.property('y').that.equals(5);
+						Expect(tmpObjectCoordinateMap[2]).to.have.property('x').that.equals(3);
+						Expect(tmpObjectCoordinateMap[2]).to.have.property('y').that.equals(6);
+
+						let tmpSparseCoordinateMap = testFable.services.Utility.generateArrayOfObjectsFromSets('x', tmpTestObject1, 'y', tmpTestObject3);
+						Expect(tmpSparseCoordinateMap).to.be.an('array');
+						Expect(tmpSparseCoordinateMap.length).to.equal(3);
+						Expect(tmpSparseCoordinateMap[0]).to.have.property('x').that.equals(1);
+						Expect(tmpSparseCoordinateMap[0]).to.have.property('y').that.equals(7);
+						Expect(tmpSparseCoordinateMap[1]).to.have.property('x').that.equals(2);
+						Expect(tmpSparseCoordinateMap[1]).to.have.property('y').that.equals(8);
+						Expect(tmpSparseCoordinateMap[2]).to.have.property('x').that.equals(3);
+						Expect(tmpSparseCoordinateMap[2]).to.not.have.property('y');
+						// The third value in tmpTestObject1 has no corresponding value in tmpTestObject3
+
+						let tmpObjectCoordinateMapBigSet = testFable.services.Utility.generateArrayOfObjectsFromSets('x', tmpTestObject1, 'y', tmpTestObject2, 'z', tmpTestObject3);
+						Expect(tmpObjectCoordinateMapBigSet).to.be.an('array');
+						Expect(tmpObjectCoordinateMapBigSet.length).to.equal(3);
+						Expect(tmpObjectCoordinateMapBigSet[0]).to.have.property('x').that.equals(1);
+						Expect(tmpObjectCoordinateMapBigSet[0]).to.have.property('y').that.equals(4);
+						Expect(tmpObjectCoordinateMapBigSet[0]).to.have.property('z').that.equals(7);
+						Expect(tmpObjectCoordinateMapBigSet[1]).to.have.property('x').that.equals(2);
+						Expect(tmpObjectCoordinateMapBigSet[1]).to.have.property('y').that.equals(5);
+						Expect(tmpObjectCoordinateMapBigSet[1]).to.have.property('z').that.equals(8);
+						Expect(tmpObjectCoordinateMapBigSet[2]).to.have.property('x').that.equals(3);
+						Expect(tmpObjectCoordinateMapBigSet[2]).to.have.property('y').that.equals(6);
+						Expect(tmpObjectCoordinateMapBigSet[2]).to.not.have.property('z');
+						// The third value in tmpTestObject1 and tmpTestObject2 has no corresponding value in tmpTestObject3
+
 						let tmpValueObject = testFable.services.Utility.createValueObjectByHashes(tmpDataObject, ['Name', 'Age', 'Colors[2]', 'Nonce', 'Details.Height']);
 						Expect(tmpValueObject.Name).to.equal('Thee Tortoise and the Hare');
 						Expect(tmpValueObject.Age).to.equal(100);