fable 3.1.28 → 3.1.30

package/package.json

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

package/source/Fable.js

@@ -125,8 +125,8 @@ class Fable extends libFableServiceBase.CoreServiceProviderBase
 	{
 		if (pServiceType in this.servicesMap)
 		{
-			// TODO: Check if any services are running?
-			this.log.warn(`Adding a service type [${pServiceType}] that already exists.  This will change the default class prototype for this service.`);
+			//this.log.warn(`Adding a service type [${pServiceType}] that already exists.  This will change the default class prototype for this service.`);
+			// This broke command-line utilities that overrode services and wanted to strictly control log output
 		}
 		else
 		{

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

@@ -225,6 +225,81 @@ class DateManipulation extends libFableServiceProviderBase
         let tmpEndDate = this.dayJS(pDateEnd);
         return tmpEndDate.diff(tmpStartDate, 'year');
     }
+
+	dateAddMilliseconds(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'millisecond', 'add');
+	}
+
+	dateAddSeconds(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'second', 'add');
+	}
+
+	dateAddMinutes(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'minute', 'add');
+	}
+
+	dateAddHours(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'hour', 'add');
+	}
+
+	dateAddDays(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'day', 'add');
+	}
+
+	dateAddWeeks(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'week', 'add');
+	}
+	
+	dateAddMonths(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'month', 'add');
+	}
+
+	dateAddYears(pDate, pAmount)
+	{
+		return this.dateMath(pDate, pAmount, 'year', 'add');
+	}
+
+	dateMath(pDate, pAmount, pUnit, pOperation)
+	{
+		try
+		{
+			let tmpDate = this.dayJS.utc(pDate);
+
+			if (pOperation === 'add')
+			{
+				tmpDate = tmpDate.add(pAmount, pUnit);
+			}
+			else if (pOperation === 'subtract')
+			{
+				tmpDate = tmpDate.subtract(pAmount, pUnit);
+			}
+			return this.dayJS.utc(tmpDate).toISOString();
+		}
+		catch (pError)
+		{
+			return undefined;
+		}
+	}
+
+	dateFromParts(pYear, pMonth, pDay, pHour = 0, pMinute = 0, pSecond = 0, pMillisecond = 0)
+	{
+		try
+		{
+			let tmpDate = this.dayJS.utc().year(pYear).month(pMonth - 1).date(pDay).hour(pHour).minute(pMinute).second(pSecond).millisecond(pMillisecond);
+			return tmpDate.toISOString();
+		}
+		catch (pError)
+		{
+			return undefined;
+		}
+	}
 }
 
 module.exports = DateManipulation;

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json

@@ -348,7 +348,49 @@
 		"Address": "fable.Dates.dateYearDifference"
 	},
 
-	"createValueObjectByHashes": {
+	"datemathadd": {
+		"Name": "Date Math Add",
+		"Address": "fable.Dates.dateMath"
+	},
+	"dateaddmilliseconds": {
+		"Name": "Date Add Milliseconds",
+		"Address": "fable.Dates.dateAddMilliseconds"
+	},
+	"dateaddseconds": {
+		"Name": "Date Add Seconds",
+		"Address": "fable.Dates.dateAddSeconds"
+	},
+	"dateaddminutes": {
+		"Name": "Date Add Minutes",
+		"Address": "fable.Dates.dateAddMinutes"
+	},
+	"dateaddhours": {
+		"Name": "Date Add Hours",
+		"Address": "fable.Dates.dateAddHours"
+	},
+	"dateadddays": {
+		"Name": "Date Add Days",
+		"Address": "fable.Dates.dateAddDays"
+	},
+	"dateaddweeks": {
+		"Name": "Date Add Weeks",
+		"Address": "fable.Dates.dateAddWeeks"
+	},
+	"dateaddmonths": {
+		"Name": "Date Add Months",
+		"Address": "fable.Dates.dateAddMonths"
+	},
+	"dateaddyears": {
+		"Name": "Date Add Years",
+		"Address": "fable.Dates.dateAddYears"
+	},
+
+	"datefromparts": {
+		"Name": "Date From Parts",
+		"Address": "fable.Dates.dateFromParts"
+	},
+
+	"createvalueobjectbyhashes": {
 		"Name": "Create Value Object by Hashes",
 		"Address": "fable.Utility.createValueObjectByHashes"
 	}

package/test/DateManipulation_tests.js

@@ -40,6 +40,10 @@ suite
 						let tmpDatePacific = tmpDate.tz("America/Los_Angeles");
 						testFable.log.trace(`Date Pacific formats to: ${tmpDatePacific.format()}`);
 
+						Expect(tmpDates.dateFromParts(2023, 8, 10, 5, 0, 0, 0)).to.equal("2023-08-10T05:00:00.000Z");
+						Expect(tmpDates.dateFromParts(2023, 8, 10)).to.equal("2023-08-10T00:00:00.000Z");
+						Expect(tmpDates.dateFromParts(2023, 12, 31, 23, 59, 59, 999)).to.equal("2023-12-31T23:59:59.999Z");
+
 						return fDone();
 					}
 				);
@@ -87,6 +91,32 @@ suite
 						return fDone();
 					}
 				);
+				test
+				(
+					'Add or remove time from dates.',
+					function(fDone)
+					{
+						let testFable = new libFable();
+						let tmpDates = testFable.instantiateServiceProvider('Dates');
+
+						const tmpFirstDate = "2023-08-10T05:00:00.000Z";
+						const tmpSecondDate = "2023-08-11T05:00:00.000Z"; // 1 day later, precisely
+						const tmpThirdDate = "2023-03-11T11:01:01.030Z";
+						const tmpFourthDate = "2025-12-25T00:00:00.000Z";
+
+						Expect(tmpDates.dateAddDays(tmpFirstDate, 1)).to.equal(tmpSecondDate);
+						Expect(tmpDates.dateAddHours(tmpFirstDate, 24)).to.equal(tmpSecondDate);
+						Expect(tmpDates.dateAddHours(tmpFirstDate, "24")).to.equal(tmpSecondDate);
+						Expect(tmpDates.dateAddMinutes(tmpFirstDate, 1440)).to.equal(tmpSecondDate);
+						Expect(tmpDates.dateAddSeconds(tmpFirstDate, 86400)).to.equal(tmpSecondDate);
+						Expect(tmpDates.dateAddMilliseconds(tmpFirstDate, 86400000)).to.equal(tmpSecondDate);
+
+						Expect(tmpDates.dateAddDays(tmpSecondDate, -1)).to.equal(tmpFirstDate);
+						Expect(tmpDates.dateAddDays(tmpSecondDate, "-1")).to.equal(tmpFirstDate);
+
+						return fDone();
+					}
+				);
 			}
 		);
 	}

package/test/ExpressionParser_tests.js

@@ -319,6 +319,9 @@ suite
 						let tmpHistogram = _Parser.solve(`aggregationhistogrambyobject(getvalue("AppData.Teams"), "States", "Score")`);
 						Expect(tmpHistogram['New York']).to.equal("250");
 
+						Expect(_Parser.solve("DateFromPartsExample = DATEFROMPARTS(2025, 4, 1)")).to.equal("2025-04-01T00:00:00.000Z");
+						Expect(_Parser.solve("DateFromPartsExample = DATEADDDAYS(DATEFROMPARTS(2025, 4, 1, 13, 03, 51, 761),87)")).to.equal("2025-06-27T13:03:51.761Z");
+
 						return fDone();
 					}
 				);