fable 3.1.47 → 3.1.49

package/package.json

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

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Base.js

@@ -28,7 +28,7 @@ class ExpressionParserOperationBase extends libFableServiceProviderBase
 		{
 			return 'Token.StateAddress';
 		}
-		else if ((pToken.length > 2) && (pToken[0] === '"') && (pToken[pToken.length-1] === '"'))
+		else if ((pToken.length > 1) && (pToken[0] === '"') && (pToken[pToken.length-1] === '"'))
 		{
 			return 'Token.String';
 		}

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer.js

@@ -39,6 +39,7 @@ class ExpressionTokenizer extends libExpressionParserOperationBase
 		 *  - String
 		 *    : Wrapped in double quotes e.g. "Hello World", "This is a test", etc.
 		 */
+		/** @type {any} */
 		let tmpCurrentTokenType = false;
 		let tmpCurrentToken = '';
 		for (let i = 0; i < pExpression.length; i++)
@@ -213,4 +214,4 @@ class ExpressionTokenizer extends libExpressionParserOperationBase
 	}
 }
 
-module.exports = ExpressionTokenizer;
+module.exports = ExpressionTokenizer;

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ValueMarshal.js

@@ -63,7 +63,7 @@ class ExpressionParserValueMarshal extends libExpressionParserOperationBase
 					tmpToken.Value = tmpValue;
 					tmpToken.Resolve = true;
 					tmpResults.ExpressionParserLog.push(`WARNING: ExpressionParser.substituteValuesInTokenizedObjects found no value for the symbol hash or address ${tmpToken.Token} at index ${i}`);
-					this.log.warn(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+					if (this.LogNoisiness > 1) this.log.warn(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
 					continue;
 				}
 				else
@@ -110,13 +110,13 @@ class ExpressionParserValueMarshal extends libExpressionParserOperationBase
 				if (!tmpValue)
 				{
 					tmpResults.ExpressionParserLog.push(`WARNING: ExpressionParser.substituteValuesInTokenizedObjects found no value for the state address ${tmpToken.Token} at index ${i}`);
-					this.log.warn(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+					//this.log.warn(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
 					continue;
 				}
 				else
 				{
 					//tmpResults.ExpressionParserLog.push(`INFO: ExpressionParser.substituteValuesInTokenizedObjects found a value [${tmpValue}] for the state address ${tmpToken.Token} at index ${i}`);
-					this.log.info(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+					//this.log.info(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
 					try
 					{
 						let tmpValueParsed = new this.fable.Utility.bigNumber(tmpValue);

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

@@ -190,6 +190,28 @@ class FableServiceExpressionParser extends libFableServiceBase
 		return this.Solver.solvePostfixedExpression(pPostfixedExpression, pDataDestinationObject, pResultObject, pManifest);
 	}
 
+	/**
+	 * Add a function to the solver.
+	 *
+	 * @param {string} pFunctionName 
+	 * @param {string} pFunctionAddress 
+	 * @param {string} pFunctionComment 
+	 */
+	addSolverFunction(pFunctionName, pFunctionAddress, pFunctionComment)
+	{
+		let tmpFunctionName = (pFunctionName || '').trim().toLowerCase();
+		if (this.functionMap.hasOwnProperty(tmpFunctionName))
+		{
+			this.log.warn(`PictDynamicFormsInformary: Function ${tmpFunctionName} already exists in the solver, overwriting with address [${pFunctionAddress}].`);
+			//return false;
+		}
+		this.functionMap[tmpFunctionName] = (
+		{
+			Name: pFunctionComment || `Autogenerated function ${tmpFunctionName}`,
+			Address: pFunctionAddress,
+		});
+	}
+
 	/**
 	 * Prepares the parameters for a SERIES directive by substituting values and applying defaults.
 	 *

package/test/ExpressionParser_tests.js

@@ -919,6 +919,68 @@ suite
 								}
 							);
 
+						test('Solver Quoted Empty Strings', () =>
+						{
+							const tmpSourceData =
+							{
+							};
+							let testFable = new libFable();
+							let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+
+							let tmpSolverResults = {};
+
+							_Parser.solve('Taco = 3', tmpSourceData, {}, false, tmpSourceData);
+							Expect(tmpSourceData.Taco).to.equal('3');
+
+							_Parser.solve('Taco = ""', tmpSourceData, tmpSolverResults, false, tmpSourceData);
+							Expect(tmpSourceData.Taco).to.equal('');
+
+							Expect(_Parser.solve('Taco = " "', tmpSourceData, tmpSolverResults, false, tmpSourceData)).to.equal(' ');
+							Expect(_Parser.solve('Taco = "Whooo"', tmpSourceData, tmpSolverResults, false, tmpSourceData)).to.equal('Whooo');
+						});
+						test('Solver Performance', () =>
+						{
+							const tmpSourceData =
+							{
+								MethodAB_WWD_Dry_MinMoistureContent: -150,
+								MethodAB_WWD_Dry_MaxMoistureContent: -18.3,
+							};
+							const tmpExpr = 'MethodAB_WWD_Dry_PlotXValues = SERIES FROM MethodAB_WWD_Dry_MinMoistureContent TO MethodAB_WWD_Dry_MaxMoistureContent STEP 0.1 : n + 0';
+							let testFable = new libFable();
+							let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+
+							const t0 = performance.now();
+							// Execute the expression multiple times to get a measurable time
+							_Parser.solve(tmpExpr, tmpSourceData, {}, false, tmpSourceData);
+							const t1 = performance.now();
+							const duration = t1 - t0;
+							testFable.log.info(`Solver Performance Test: Executed in ${duration} milliseconds.`);
+							Expect(tmpSourceData.MethodAB_WWD_Dry_PlotXValues.length).to.equal(1318);
+							Expect(tmpSourceData.MethodAB_WWD_Dry_PlotXValues[0]).to.equal('-150');
+							Expect(tmpSourceData.MethodAB_WWD_Dry_PlotXValues[1317]).to.equal('-18.3');
+							Expect(duration).to.be.below(100);
+						});
+						test
+							(
+								'Custom Solver Functions',
+								(fNext) =>
+								{
+									let testFable = new libFable();
+
+									testFable.MonkeyFunction = (pParameter) => { return `Monkey says hello to ${pParameter}`; };
+
+									let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+									let tmpResultsObject = {};
+									let tmpDestinationObject = {};
+
+									_Parser.addSolverFunction('monkeypatchedfunction', 'fable.MonkeyFunction', 'This is just for documentation.');
+									
+									_Parser.solve('MonkeyResult = monkeypatchedfunction("Jerry")', testFable, tmpResultsObject, false, tmpDestinationObject);
+									Expect(tmpDestinationObject.MonkeyResult).to.equal('Monkey says hello to Jerry');
+									return fNext();
+								}
+							);
+
 						test
 							(
 								'Series + Regression',