@bash-app/bash-common 29.44.1 → 29.44.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.44.1",
+  "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 {
@@ -42,21 +42,16 @@ export function ensureIsDateTime(possiblyADate: DateTimeArgType): Date | undefin
 export function normalizeDate(validDate: Date | string | undefined | null): Date | undefined {
   if (!validDate) return undefined;
 
-  // Convert to Date object if it's a string
-  const date = typeof validDate === "string" ? new Date(validDate) : validDate;
+  const date = new Date(validDate);
 
-  // Check if the date is valid
   if (isNaN(date.getTime())) {
     console.error("Invalid date provided:", validDate);
     return undefined;
   }
 
-  // Use dayjs to normalize the date and convert to UTC
-  const normalizedDate = dayjs(date).utc().startOf("minute").toDate();
-
-  return normalizedDate;
+  // 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) => normalizeDate(date)) // Normalize each date
@@ -178,12 +173,16 @@ export function setDateButPreserveTime(
 }
 
 
-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 {
@@ -232,4 +231,4 @@ export function localDateToUTC(date: Date): Date {
               date.getUTCMinutes(), date.getUTCSeconds());
 
   return newDate;
-}
+}