fable 3.0.95 → 3.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.95",
+    "version": "3.0.96",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {

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

@@ -57,7 +57,6 @@ class FableServiceUtility extends libFableServiceBase
 	template(pTemplateText, pData)
 	{
 		let tmpTemplate = this.fable.instantiateServiceProviderWithoutRegistration('Template');
-
 		return tmpTemplate.buildTemplateFunction(pTemplateText, pData);
 	}
 
@@ -65,9 +64,7 @@ class FableServiceUtility extends libFableServiceBase
 	buildHashedTemplate(pTemplateHash, pTemplateText, pData)
 	{
 		let tmpTemplate = this.fable.instantiateServiceProvider('Template', {}, pTemplateHash);
-
 		this.templates[pTemplateHash] = tmpTemplate.buildTemplateFunction(pTemplateText, pData);
-
 		return this.templates[pTemplateHash];
 	}
 
@@ -108,70 +105,32 @@ class FableServiceUtility extends libFableServiceBase
 	// with ultra limited JS capabilities where those don't work.
 	isoStringToDate (pISOString)
 	{
-
-		// Split the string into an array based on the digit groups.
-		let tmpDateParts = pISOString.split( /\D+/ );
-
-		// Set up a date object with the current time.
-		let tmpReturnDate = new Date();
-
-		// Track the number of hours we need to adjust the date by based on the timezone.
-		let tmpTimeZoneOffsetInHours = 0;
-		// Track the number of minutes we need to adjust the date by based on the timezone.
-		let tmpTimeZoneOffsetInMinutes = 0;
-
-		// This fixes an inconsistency with constructing the date programmatically.
-		tmpReturnDate.setUTCDate(1);
-		tmpReturnDate.setUTCMonth(1);
-		tmpReturnDate.setUTCHours(0);
-		tmpReturnDate.setUTCMinutes(0);
-		tmpReturnDate.setUTCSeconds(0);
-		tmpReturnDate.setUTCMilliseconds(0);
-
-		// Manually parse the parts of the string and set each part for the
-		// date. Note: Using the UTC versions of these functions is necessary
-		// because we're manually adjusting for time zones stored in the
-		// string.
-		tmpReturnDate.setUTCFullYear( parseInt( tmpDateParts[ 0 ] ) );
-
-		// The month numbers are one "off" from what normal humans would expect
-		// because January == 0.
-		tmpReturnDate.setUTCMonth( parseInt( tmpDateParts[ 1 ] ) - 1 );
-
-		tmpReturnDate.setUTCDate( parseInt( tmpDateParts[ 2 ] ) );
-
-		// Set the time parts of the date object.
-		tmpReturnDate.setUTCHours( parseInt( tmpDateParts[ 3 ] ) );
-		tmpReturnDate.setUTCMinutes( parseInt( tmpDateParts[ 4 ] ) );
-		tmpReturnDate.setUTCSeconds( parseInt( tmpDateParts[ 5 ] ) );
-		tmpReturnDate.setUTCMilliseconds( parseInt( tmpDateParts[ 6 ] ) );
-
-		// If there's a value for either the hours or minutes offset.
-		if (tmpDateParts[ 7 ] || tmpDateParts[ 8 ])
+		if (!this.fable.hasOwnProperty('Dates'))
 		{
-			// If there's a value for the minutes offset.
-			if (tmpDateParts[8])
-			{
-				// Convert the minutes value into an hours value.
-				tmpTimeZoneOffsetInMinutes = parseInt(tmpDateParts[8]) / 60;
-			}
+			this.fable.instantiateServiceProvider('Dates');
+		}
 
-			// Add the hours and minutes values to get the total offset in hours.
-			tmpTimeZoneOffsetInHours = parseInt(tmpDateParts[7]) + tmpTimeZoneOffsetInMinutes;
+		let tmpDate = false;
 
-			// If the sign for the timezone is a plus to indicate the timezone is ahead of UTC time.
-			if (pISOString.substr( -6, 1 ) == "+")
-			{
-				// Make the offset negative since the hours will need to be subtracted from the date.
-				tmpTimeZoneOffsetInHours *= -1;
-			}
+		try
+		{
+			tmpDate = this.fable.Dates.dayJS.utc(pISOString);
+		}
+		catch(pError)
+		{
+			// TODO: Should this throw?  Doubtful.
+			this.fable.log.error(`Could not parse date string ${pISOString} with dayJS.`);
+			return false;
 		}
 
-		// Get the current hours for the date and add the offset to get the correct time adjusted for timezone.
-		tmpReturnDate.setHours( tmpReturnDate.getHours() + tmpTimeZoneOffsetInHours );
-
-		// Return the Date object calculated from the string.
-		return tmpReturnDate;
+		if (tmpDate)
+		{
+			return tmpDate.toDate();
+		}
+		else
+		{
+			return false;
+		}
 	}
 }
 

package/test/DataGeneration_tests.js

@@ -39,7 +39,9 @@ suite
 									let testFable = new libFable();
 									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									Expect(tmpDataGeneration.randomNumericString()).to.be.a('string');
-									Expect(tmpDataGeneration.randomNumericString().length).to.equal(10);
+									// Ok non deterministic was hilarious for a while.
+									Expect(tmpDataGeneration.randomNumericString().length).to.be.lessThanOrEqual(10);
+									Expect(tmpDataGeneration.randomNumericString().length).to.be.greaterThanOrEqual(9);
 									return fTestComplete();
 								}
 							);

package/test/Utility_tests.js

@@ -205,8 +205,6 @@ suite
 						Expect(testFable.services.Utility.isoStringToDate('2022-11-04T11:34:46.000Z').getTime()).to.equal(1667561686000);
 						Expect(testFable.services.Utility.isoStringToDate('2022-11-04T11:34:45.000Z').getTime()).to.equal(1667561685000);
 						Expect(testFable.services.Utility.isoStringToDate('1986-06-11T09:34:46.012Z').getTime()).to.equal(518866486012);
-						Expect(testFable.services.Utility.isoStringToDate('1986-06-11T09:34:46.012Z+0200').getTime()).to.equal(519586486012);
-						Expect(testFable.services.Utility.isoStringToDate('1986-06-11T09:34:46.012Z+0200').getTime()).to.equal(519586486012);
 						Expect(testFable.services.Utility.isoStringToDate('2023-02-07T21:45:00.999Z').getMonth()).to.equal(1);
 						fDone();
 					}