fable 3.1.27 → 3.1.28

package/package.json

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

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

@@ -407,6 +407,12 @@ class ExpressionParserPostfix extends libExpressionParserOperationBase
 				else if (tmpPostfixTokenObject.Token === ')')
 				{
 					let tmpOpenParenthesis = tmpFunctionCacheLIFOStack.pop();
+					if (!tmpOpenParenthesis)
+					{
+						tmpResults.ExpressionParserLog.push(`ERROR: ExpressionParser.buildPostfixedSolveList found a closing parenthesis at token index ${i} with no corresponding opening parenthesis.`);
+						continue;
+					}
+
 					if (tmpOpenParenthesis.IsFunction)
 					{
 						tmpPostfixTokenObject.IsFunction = true;
@@ -471,6 +477,12 @@ class ExpressionParserPostfix extends libExpressionParserOperationBase
 							}
 						}
 					}
+					if (!tmpOpenParenthesis)
+					{
+						tmpResults.ExpressionParserLog.push(`ERROR: ExpressionParser.buildPostfixedSolveList found a closing parenthesis at token index ${i} with no corresponding opening parenthesis.`);
+						continue;
+					}
+
 					if (tmpOpenParenthesis.PreviousOperator && tmpOpenParenthesis.NextOperator)
 					{
 						if (tmpOpenParenthesis.PreviousOperator.Descriptor.Precedence <= tmpOpenParenthesis.NextOperator.Descriptor.Precedence)

package/test/ExpressionParser_tests.js

@@ -54,6 +54,8 @@ suite
 						let tokenizedNegativeParams = _Parser.tokenize('SUM(10, -10)');
 						//Expect(tokenizedNegativeParams.length).to.equal(6);
 						Expect(tokenizedNegativeParams).to.deep.equal(['SUM', '(', '10', ',', '-', '10', ')']);
+						let unbalancedParens = _Parser.tokenize('ROUND(5 + (2 * 10), 10))');
+						Expect(unbalancedParens).to.deep.equal(['ROUND', '(', '5', '+', '(', '2', '*', '10', ')', ',', '10', ')', ')']);
 						return fDone();
 					}
 				);
@@ -78,6 +80,12 @@ suite
 						let brokenLintedResults = _Parser.lintTokenizedExpression(brokenTokenizedResults, tmpResultObject);
 						// The */ is invalid!!!!
 						Expect(brokenLintedResults.length).to.equal(1);
+
+						let unbalancedParensTokenizedResults = _Parser.tokenize('Value = ROUND(5 + (2 * 10), 10))');
+						let unbalancedParensLintedResults = _Parser.lintTokenizedExpression(unbalancedParensTokenizedResults, tmpResultObject);
+						// The unbalanced parens should be caught
+						Expect(unbalancedParensLintedResults.length).to.equal(1);
+						Expect(unbalancedParensLintedResults[0]).to.contain('unbalanced parenthesis');
 						return fDone();
 					}
 				);
@@ -173,6 +181,20 @@ suite
 						testFable.ExpressionParser.Messaging.logFunctionSolve(tmpResultObject);
 						Expect(tmpDestinationObject.EGS).to.equal("0.0061");
 
+						tmpDataObject.EJBinderGb1 = '15.5';
+						tmpDataObject.EKPctBinderPb2 = '2.55555';
+						_Parser.solve('EGse1 = Round((100 - EJBinderGb1) / EKPctBinderPb2), 2)', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+						//TODO: we can consider solving and ignoring this paren, but for now, the error is fatal
+						Expect(tmpDestinationObject.EGse1).to.not.exist;
+						testFable.ExpressionParser.Messaging.logFunctionSolve(tmpResultObject);
+
+						_Parser.solve('EGse1 = Round((100 - EJBinderGb1) / EKPctBinderPb2, 2)', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.EGse1).to.equal('33.07');
+
+						_Parser.solve('EGse1 = Round((100 - EJBinderGb1) / EKPctBinderPb2), 2)', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+						// ensure that this does mutate the output on error
+						Expect(tmpDestinationObject.EGse1).to.not.exist;
+
 						return fDone();
 					}
 				);