fable 3.1.45 → 3.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.45",
+  "version": "3.1.47",
   "description": "A service dependency injection, configuration and logging library.",
   "main": "source/Fable.js",
   "scripts": {
@@ -59,7 +59,7 @@
     "cachetrax": "^1.0.4",
     "cookie": "^1.0.2",
     "data-arithmatic": "^1.0.7",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.19",
     "fable-log": "^3.0.16",
     "fable-serviceproviderbase": "^3.0.15",
     "fable-settings": "^3.0.12",

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

@@ -70,22 +70,23 @@ class ExpressionParserValueMarshal extends libExpressionParserOperationBase
 				{
 					tmpResults.ExpressionParserLog.push(`INFO: ExpressionParser.substituteValuesInTokenizedObjects found a value [${tmpValue}] for the state address ${tmpToken.Token} at index ${i}`);
 					if (this.LogNoisiness > 1) this.log.info(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
-					try
+					if (typeof tmpValue === 'object') // this encapsulates POJOs and arrays
 					{
-						let tmpValueParsed = new this.fable.Utility.bigNumber(tmpValue);
+						// this must be checked first, which works around an edge case where bigNumber turns single-element arrays into numbers, which we never want
 						tmpToken.Resolved = true;
-						tmpToken.Value = tmpValueParsed.toString();
+						tmpToken.Value = tmpValue;
 					}
-					catch(pError)
+					else
 					{
-						// TODO: Should we allow this to be a function?  Good god the complexity and beauty of that...
-						if (Array.isArray(tmpValue) || (typeof(tmpValue) === 'object'))
+						try
 						{
+							const tmpValueParsed = new this.fable.Utility.bigNumber(tmpValue);
 							tmpToken.Resolved = true;
-							tmpToken.Value = tmpValue;
+							tmpToken.Value = tmpValueParsed.toString();
 						}
-						else
+						catch(pError)
 						{
+							// TODO: Should we allow this to be a function?  Good god the complexity and beauty of that...
 							tmpToken.Resolved = true;
 							tmpToken.Value = tmpValue;
 							tmpResults.ExpressionParserLog.push(`INFO: ExpressionParser.substituteValuesInTokenizedObjects found a non-numeric value for the state address ${tmpToken.Token} at index ${i}; using raw value.`);

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

@@ -25,6 +25,7 @@ class FableServiceMath extends libFableServiceBase
 		this.pi = '3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679';
 		// From NASA: https://apod.nasa.gov/htmltest/gifcity/e.2mil
 		this.euler = '2.7182818284590452353602874713526624977572470936999595749669676277240766303535475945713821785251664';
+		this.errorReturnValue = NaN;
 
 		//		this.manifest = this.fable.newManyfest();
 		this.bigNumber = this.fable.Utility.bigNumber;
@@ -146,9 +147,16 @@ class FableServiceMath extends libFableServiceBase
 		let tmpDecimals = isNaN(pDecimals) ? 0 : parseInt(pDecimals, 10);
 		let tmpRoundingMethod = (typeof (pRoundingMethod) === 'undefined') ? this.roundHalfUp : parseInt(pRoundingMethod, 10);
 
-		let tmpArbitraryValue = new this.bigNumber(tmpValue);
-		let tmpResult = tmpArbitraryValue.round(tmpDecimals, tmpRoundingMethod);
-		return tmpResult.toString();
+		try
+		{
+			let tmpArbitraryValue = new this.bigNumber(tmpValue);
+			let tmpResult = tmpArbitraryValue.round(tmpDecimals, tmpRoundingMethod);
+			return tmpResult.toString();
+		}
+		catch
+		{
+			return this.errorReturnValue;
+		}
 	}
 
 	/**
@@ -165,10 +173,16 @@ class FableServiceMath extends libFableServiceBase
 		let tmpDecimals = isNaN(pDecimals) ? 0 : parseInt(pDecimals, 10);
 		let tmpRoundingMethod = (typeof (pRoundingMethod) === 'undefined') ? this.roundHalfUp : pRoundingMethod;
 
-		let tmpArbitraryValue = new this.bigNumber(tmpValue);
-		let tmpResult = tmpArbitraryValue.toFixed(tmpDecimals, tmpRoundingMethod);
-
-		return tmpResult.toString();
+		try
+		{
+			let tmpArbitraryValue = new this.bigNumber(tmpValue);
+			let tmpResult = tmpArbitraryValue.toFixed(tmpDecimals, tmpRoundingMethod);
+			return tmpResult.toString();
+		}
+		catch
+		{
+			return this.errorReturnValue;
+		}
 	}
 
 	/**

package/test/ExpressionParser_tests.js

@@ -145,6 +145,41 @@ suite
 								}
 							);
 						test
+							(
+								'Capture array -> number bug',
+								(fDone) =>
+								{
+									let _Parser = getExpressionParser();
+
+									let tmpResultObject = {};
+									let tmpDataObject = { W: ['3', '4', '5'], X: ['5'], Y: 3, Z: 75, Depth: 3, Width: 2 };
+									let tmpDestinationObject = {};
+
+									let tmpArea = _Parser.solve('Area = X * Y * Z', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+
+									Expect(tmpArea).to.equal("1125");
+
+									let tmpSliced = _Parser.solve('SlicedSingleElementArray = SLICE(X, 0, 1)', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+
+									Expect(tmpSliced).to.be.an('array');
+									Expect(tmpSliced.length).to.equal(1);
+									Expect(tmpSliced[0]).to.equal('5');
+
+									let tmpNonNumberTreatedAsZero = _Parser.solve('NonNumberTreatedAsZero = W + 3.456', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+
+									Expect(tmpNonNumberTreatedAsZero).to.equal('3.456');
+
+									let tmpLargerSlice = _Parser.solve('SLICE(W, 1, 3)', tmpDataObject, tmpResultObject, false, tmpDestinationObject);
+
+									Expect(tmpLargerSlice).to.be.an('array');
+									Expect(tmpLargerSlice.length).to.equal(2);
+									Expect(tmpLargerSlice[0]).to.equal('4');
+									Expect(tmpLargerSlice[1]).to.equal('5');
+
+									return fDone();
+								}
+							);
+						test
 							(
 								'Exercise Marshaling to Value at a Hashed Address',
 								(fDone) =>