fable 3.1.17 → 3.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.17",
+  "version": "3.1.19",
   "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

@@ -129,6 +129,11 @@
 		"Address": "fable.Utility.getInternalValueByHash"
 	},
 
+	"createarrayfromabsolutevalues": {
+		"Name": "Create Array from Absolute Values",
+		"Address": "fable.Utility.createArrayFromAbsoluteValues"
+	},
+
 	"flatten": {
 		"Name": "flatten an array of values",
 		"Address": "fable.Utility.flattenArrayOfSolverInputs"

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

@@ -668,8 +668,10 @@ class FableServiceMath extends libFableServiceBase
 		return tmpSortedHistogram;
 	}
 
-	cleanValueArray(pValueArray)
+	cleanValueArray(pValueArray, pRemoveZeroes)
 	{
+		let tmpRemoveZeroes = (typeof (pRemoveZeroes) === 'undefined') ? false : pRemoveZeroes;
+
 		if (!Array.isArray(pValueArray))
 		{
 			return [];
@@ -679,7 +681,7 @@ class FableServiceMath extends libFableServiceBase
 		for (let i = 0; i < pValueArray.length; i++)
 		{
 			let tmpValue = this.parsePrecise(pValueArray[i], NaN);
-			if (!isNaN(tmpValue))
+			if (!isNaN(tmpValue) && (!tmpRemoveZeroes || (tmpValue != "0")))
 			{
 				tmpCleanedArray.push(tmpValue);
 			}

package/source/services/Fable-Service-MetaTemplate/MetaTemplate-StringParser.js

@@ -84,11 +84,12 @@ class StringParser
 	 * @param {string} pCharacter - The character to append
 	 * @param {Object} pParserState - The state object for the current parsing task
 	 * @param {any} pData - The data available to the template
-	 * @param {any} pDataContext - The history of data objects/context already passed in
+	 * @param {Array<any>} pDataContext - The history of data objects/context already passed in
 	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 * @param {any} [pState] - A catchall state object for plumbing data through template processing.
 	 * @private
 	 */
-	parseCharacter (pCharacter, pParserState, pData, pDataContext, pScope)
+	parseCharacter (pCharacter, pParserState, pData, pDataContext, pScope, pState)
 	{
 		// If we are already in a pattern match traversal
 		if (pParserState.PatternMatch)
@@ -112,11 +113,11 @@ class StringParser
 					let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
 					if (tmpFunctionContext)
 					{
-						pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope);
+						pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope, pState);
 					}
 					else
 					{
-						pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope);
+						pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope, pState);
 					}
 					return this.resetOutputBuffer(pParserState);
 				}
@@ -155,11 +156,11 @@ class StringParser
 						let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
 						if (tmpFunctionContext)
 						{
-							pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope);
+							pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope, pState);
 						}
 						else
 						{
-							pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope);
+							pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope, pState);
 						}
 						return this.resetOutputBuffer(pParserState);
 					}
@@ -192,7 +193,15 @@ class StringParser
 		return false;
 	}
 
-	executePatternAsync(pParserState, pData, fCallback, pDataContext, pScope)
+	/**
+	 * @param {Object} pParserState - The state object for the current parsing task
+	 * @param {Object} pData - The data to pass to the function as a second parameter
+	 * @param {function} fCallback - The callback function to call when the parse is complete
+	 * @param {array} pDataContext - The history of data objects/context already passed in
+	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 * @param {any} [pState] - A catchall state object for plumbing data through template processing.
+	 */
+	executePatternAsync(pParserState, pData, fCallback, pDataContext, pScope, pState)
 	{
 		// ... this is the end of a pattern, cut off the end tag and parse it.
 		// Trim the start and end tags off the output buffer now
@@ -213,7 +222,7 @@ class StringParser
 						pParserState.OutputBuffer = pAsyncOutput;
 						this.resetOutputBuffer(pParserState);
 						return fCallback();
-					}, pDataContext, pScope);
+					}, pDataContext, pScope, pState);
 			}
 			else
 			{
@@ -228,7 +237,7 @@ class StringParser
 						pParserState.OutputBuffer = pAsyncOutput;
 						this.resetOutputBuffer(pParserState);
 						return fCallback();
-					}, pDataContext, pScope);
+					}, pDataContext, pScope, pState);
 			}
 		}
 		else
@@ -237,11 +246,11 @@ class StringParser
 			let tmpFunctionContext = ('ParserContext' in pParserState.Pattern) ? pParserState.Pattern.ParserContext : false;
 			if (tmpFunctionContext)
 			{
-				pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope);
+				pParserState.OutputBuffer = pParserState.Pattern.Parse.call(tmpFunctionContext, pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope, pState);
 			}
 			else
 			{
-				pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope);
+				pParserState.OutputBuffer = pParserState.Pattern.Parse(pParserState.OutputBuffer.substr(pParserState.Pattern.PatternStartString.length, pParserState.OutputBuffer.length - (pParserState.Pattern.PatternStartString.length+pParserState.Pattern.PatternEndString.length)), pData, pDataContext, pScope, pState);
 			}
 			this.resetOutputBuffer(pParserState);
 			return fCallback();
@@ -258,9 +267,10 @@ class StringParser
 	 * @param {function} fCallback - The callback function to call when the parse is complete
 	 * @param {array} pDataContext - The history of data objects/context already passed in
 	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 * @param {any} [pState] - A catchall state object for plumbing data through template processing.
 	 * @private
 	 */
-	parseCharacterAsync (pCharacter, pParserState, pData, fCallback, pDataContext, pScope)
+	parseCharacterAsync (pCharacter, pParserState, pData, fCallback, pDataContext, pScope, pState)
 	{
 		// If we are already in a pattern match traversal
 		if (pParserState.PatternMatch)
@@ -282,7 +292,7 @@ class StringParser
 					// If this last character is the end of the pattern, parse it.
 					if ('Parse' in pParserState.Pattern)
 					{
-						return this.executePatternAsync(pParserState, pData, fCallback, pDataContext, pScope);
+						return this.executePatternAsync(pParserState, pData, fCallback, pDataContext, pScope, pState);
 					}
 				}
 				else if (pCharacter in pParserState.PatternStartNode.PatternEnd)
@@ -316,7 +326,7 @@ class StringParser
 					// If this last character is the end of the pattern, parse it.
 					if ('Parse' in pParserState.Pattern)
 					{
-						return this.executePatternAsync(pParserState, pData, fCallback, pDataContext, pScope);
+						return this.executePatternAsync(pParserState, pData, fCallback, pDataContext, pScope, pState);
 					}
 				}
 			}
@@ -357,8 +367,9 @@ class StringParser
 	 * @param {function} fCallback - The callback function to call when the parse is complete
 	 * @param {array} pDataContext - The history of data objects/context already passed in
 	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 * @param {any} [pState] - A catchall state object for plumbing data through template processing.
 	 */
-	parseString (pString, pParseTree, pData, fCallback, pDataContext, pScope)
+	parseString (pString, pParseTree, pData, fCallback, pDataContext, pScope, pState)
 	{
 		// TODO: There is danger here if a template function attempts to functionally recurse and doesn't pass this in.
 		let tmpPreviousDataContext = (Array.isArray(pDataContext)) ? pDataContext : [];
@@ -372,7 +383,7 @@ class StringParser
 			for (var i = 0; i < pString.length; i++)
 			{
 				// TODO: This is not fast.
-				this.parseCharacter(pString[i], tmpParserState, pData, tmpDataContext, pScope);
+				this.parseCharacter(pString[i], tmpParserState, pData, tmpDataContext, pScope, pState);
 			}
 
 			this.flushOutputBuffer(tmpParserState);
@@ -392,7 +403,7 @@ class StringParser
 				tmpAnticipate.anticipate(
 					(fCallback) =>
 					{
-						this.parseCharacterAsync(pString[i], tmpParserState, pData, fCallback, tmpDataContext, pScope);
+						this.parseCharacterAsync(pString[i], tmpParserState, pData, fCallback, tmpDataContext, pScope, pState);
 					});
 			}
 

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

@@ -43,15 +43,16 @@ class FableServiceMetaTemplate extends libFableServiceBase
 	 * @param {function} fCallback - The callback function to call when a pattern is matched
 	 * @param {array} pDataContext - The history of data objects already passed in
 	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 * @param {any} [pState] - A catchall state object for plumbing data through template processing.
 	 * @return {string} The result from the parser
 	 */
-	parseString(pString, pData, fCallback, pDataContext, pScope)
+	parseString(pString, pData, fCallback, pDataContext, pScope, pState)
 	{
 		if (this.LogNoisiness > 4)
 		{
 			this.fable.log.trace(`Metatemplate parsing template string [${pString}] where the callback is a ${typeof(fCallback)}`, {TemplateData:pData});
 		}
-		return this.StringParser.parseString(pString, this.ParseTree, pData, fCallback, pDataContext, pScope);
+		return this.StringParser.parseString(pString, this.ParseTree, pData, fCallback, pDataContext, pScope, pState);
 	}
 }
 

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

@@ -486,6 +486,20 @@ class FableServiceUtility extends libFableServiceBase
 		};
 		return pInputArray.flatMap(tmpArrayFlattener);
 	}
+
+	/**
+	 * Take a set of arbitrary parameters and build an array from them
+	 * @returns {Array} - An array built from the absolute values of the parameters
+	 */
+	createArrayFromAbsoluteValues()
+	{
+		let tmpArray = [];
+		for (let i = 0; i < arguments.length; i++)
+		{
+			tmpArray.push(arguments[i]);
+		}
+		return tmpArray;
+	}
 }
 
 module.exports = FableServiceUtility;

package/test/ExpressionParser_tests.js

@@ -398,6 +398,13 @@ suite
 						// Now through the solver
 
 						let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+
+						testFable.AppData.Value1 = "100"; // Comment
+						testFable.AppData.Value2 = "-80.5"; // Comment
+						testFable.AppData.Value3 = "10000"; // Comment
+						testFable.AppData.Value4 = "-333.333"; // Comment
+						testFable.AppData.Value5 = "0"; // Comment
+
 						let tmpResultsObject = {};
 						let tmpDestinationObject = {};
 
@@ -405,6 +412,24 @@ suite
 						_Parser.solve('AggregationResult = aggregationHistogram("AppData.Cities", "state", "population")', testFable, tmpResultsObject, false, tmpDestinationObject);
 						_Parser.solve('PopSum = sum(flatten(AppData.Cities[].population, AppData.Cities[].latitude))', testFable, tmpResultsObject, false, tmpDestinationObject);
 
+						//_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						//Expect(tmpDestinationObject.MadeUpValueArray).to.equal('600');
+						_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(AppData.Value1, AppData.Value2, AppData.Value3, AppData.Value4, AppData.Value5)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('1937.23');
+
+						_Parser.solve('MadeUpValueArray = ROUND(AVG(cleanvaluearray(createarrayfromabsolutevalues(AppData.Value1, AppData.Value2, AppData.Value3, AppData.Value4, AppData.Value5), 1)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('2421.54');
+
+//						_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(100, -80.5, 10000, -333.333, 0)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+//						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('600');
+
+
+						_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(100, 10, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('550.83');
+
+						// _Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(-5, 5, 0, -10, 10, -25, 25, -50, 50)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						// Expect(tmpDestinationObject.MadeUpValueArray).to.equal('25');
+
 
 						Expect(tmpDestinationObject.DistributionResult.Alabama).to.equal(12);
 						Expect(tmpDestinationObject.DistributionResult.Colorado).to.equal(21);

package/test/Utility_tests.js

@@ -411,6 +411,23 @@ suite
 						return fDone();
 					}
 				);
+				test
+				(
+					'createArrayFromAbsoluteValues works as expected',
+					function(fDone)
+					{
+						testFable = new libFable();
+
+						let tmpResult = testFable.services.Utility.createArrayFromAbsoluteValues(0,3,5,9);
+						Expect(tmpResult).to.be.an('array');
+						Expect(tmpResult.length).to.equal(4);
+						Expect(tmpResult[0]).to.equal(0);
+						Expect(tmpResult[1]).to.equal(3);
+						Expect(tmpResult[2]).to.equal(5);
+						Expect(tmpResult[3]).to.equal(9);
+						return fDone();
+					}
+				)
 			}
 		);
 	}