@bash-app/bash-common 29.44.0 → 29.44.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.44.0",
+  "version": "29.44.2",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/src/utils/dateTimeUtils.ts

@@ -19,7 +19,7 @@ export const TIME_FORMAT_AM_PM = "h:mm A";
 export interface ITime {
   hours: number;
   minutes: number;
-  ampm: string;
+  ampm: 'AM' | 'PM';
 }
 
 export function formatDateRange(startDateTimeArg: Date | null, endDateTimeArg: Date | null): string {
@@ -40,25 +40,25 @@ export function ensureIsDateTime(possiblyADate: DateTimeArgType): Date | undefin
 }
 
 export function normalizeDate(validDate: Date | string | undefined | null): Date | undefined {
-  if (validDate) {
-    if (typeof validDate === 'string') {
-      validDate = new Date(validDate);
-    }
-    validDate.setHours(validDate.getHours(), validDate.getMinutes(), 0);
-    return validDate;
+  if (!validDate) return undefined;
+
+  const date = new Date(validDate);
+
+  if (isNaN(date.getTime())) {
+    console.error("Invalid date provided:", validDate);
+    return undefined;
   }
-}
 
-export function normalizeDates(dates: Date[]): Date[] {
+  // Normalize to UTC and start of minute
+  return dayjs(date).utc().startOf("minute").toDate();
+}
+export function normalizeDates(dates: (Date | string | undefined | null)[]): Date[] {
   return dates
-    .map((date): Date | undefined => {
-      return normalizeDate(date);
-    })
-    .filter((dateTime: Date | undefined): boolean => {
-      return !!dateTime
-    }) as Date[];
+    .map((date) => normalizeDate(date)) // Normalize each date
+    .filter((date): date is Date => !!date); // Filter out invalid dates
 }
 
+
 export function formatDateTimeToISODateTimeString(date: DateTimeArgType): string | undefined {
   if (!date) {
     return undefined;
@@ -136,19 +136,53 @@ export function compareDateTime(date1: DateTimeArgType,
   }
 }
 
-export function setDateButPreserveTime(dateArg: DateType, dateWithTheTimeYouWantToKeep: DateType | undefined): Date {
-  const date = dayjs(dateArg).format(DATE_FORMAT_ISO);
-  const time = dayjs(dateWithTheTimeYouWantToKeep).format(TIME_FORMAT_AM_PM);
-  const combinedDateTime = dayjs(date + " " + time).toDate();
+export function setDateButPreserveTime(
+  dateArg: DateType,
+  dateWithTheTimeYouWantToKeep: DateType | undefined
+): Date {
+  if (!dateArg || !dateWithTheTimeYouWantToKeep) {
+    console.error("Invalid arguments:", { dateArg, dateWithTheTimeYouWantToKeep });
+    throw new Error("Both dateArg and dateWithTheTimeYouWantToKeep are required.");
+  }
+
+  // Get local timezone
+  const localTimeZone = dayjs.tz.guess();
+
+  // Format date and time parts
+  const datePart = dayjs(dateArg).tz(localTimeZone).format("YYYY-MM-DD"); // Local date
+  const timePart = dayjs(dateWithTheTimeYouWantToKeep).tz(localTimeZone).format("HH:mm"); // Local time
+
+  // Combine into an ISO string
+  const combinedDateTimeString = `${datePart}T${timePart}`;
+  console.log("Combining date and time:", {
+    datePart,
+    timePart,
+    combinedDateTimeString,
+    localTimeZone,
+  });
+
+  // Convert to UTC
+  const combinedDateTime = dayjs.tz(combinedDateTimeString, localTimeZone).toDate();
+  if (isNaN(combinedDateTime.getTime())) {
+    console.error("Invalid combined datetime:", combinedDateTimeString);
+    throw new Error("Invalid date or time format.");
+  }
+
+  console.log("Final combined DateTime (UTC):", combinedDateTime);
   return combinedDateTime;
 }
 
-export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITime): Date {
-  const dateTime = new Date(date ?? Date.now());
-  const parsedTimeDate = new Date();
-  parsedTimeDate.setHours(parsedTime.hours, parsedTime.minutes, 0); // Will change the date depending on time; corrected later
-  const correctTimeOnDate = setDateButPreserveTime(dateTime, parsedTimeDate);
-  return correctTimeOnDate;
+
+export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITime | null): Date {
+  const isValidDate = dayjs(date).isValid();
+  const dateTime = new Date(isValidDate && date ? date : Date.now());
+  if (parsedTime) {
+    const parsedTimeDate = new Date();
+    parsedTimeDate.setHours(parsedTime.hours, parsedTime.minutes, 0); // Will change the date depending on time; corrected later
+    const correctTimeOnDate = setDateButPreserveTime(dateTime, parsedTimeDate);
+    return correctTimeOnDate;
+  }
+  return dateTime;
 }
 
 export function ensureDateTimeIsLocalDateTime(dateArg: DateType | Dayjs | undefined): Dayjs {
@@ -197,4 +231,4 @@ export function localDateToUTC(date: Date): Date {
               date.getUTCMinutes(), date.getUTCSeconds());
 
   return newDate;
-}
+}