@discomedia/utils 1.0.16 → 1.0.17

package/dist/index.cjs

@@ -388,16 +388,24 @@ class MarketTimeCalculator {
     /**
      * Get the last full trading date
      */
-    getLastFullTradingDate(currentDate = new Date()) {
+    getLastFullTradingDate(currentDate = new Date(), extendedHours = true) {
         const nowET = dateFnsTz.toZonedTime(currentDate, this.timezone);
-        // If today is a market day and we're after extended hours close, return today
         if (this.calendar.isMarketDay(nowET)) {
             const timeInMinutes = nowET.getHours() * 60 + nowET.getMinutes();
-            let extendedEndMinutes = MARKET_CONFIG.TIMES.EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EXTENDED_END.minute;
-            if (this.calendar.isEarlyCloseDay(nowET)) {
-                extendedEndMinutes = MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.minute;
+            let endMinutes;
+            if (extendedHours) {
+                endMinutes = MARKET_CONFIG.TIMES.EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EXTENDED_END.minute;
+                if (this.calendar.isEarlyCloseDay(nowET)) {
+                    endMinutes = MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.minute;
+                }
+            }
+            else {
+                endMinutes = MARKET_CONFIG.TIMES.MARKET_CLOSE.hour * 60 + MARKET_CONFIG.TIMES.MARKET_CLOSE.minute;
+                if (this.calendar.isEarlyCloseDay(nowET)) {
+                    endMinutes = MARKET_CONFIG.TIMES.EARLY_CLOSE.hour * 60 + MARKET_CONFIG.TIMES.EARLY_CLOSE.minute;
+                }
             }
-            if (timeInMinutes >= extendedEndMinutes) {
+            if (timeInMinutes >= endMinutes) {
                 return dateFnsTz.fromZonedTime(dateFns.set(nowET, { hours: 0, minutes: 0, seconds: 0, milliseconds: 0 }), this.timezone);
             }
         }
@@ -768,6 +776,12 @@ function getMarketStatus(options = {}) {
 function isMarketDay(date) {
     return marketCalendar.isMarketDay(date);
 }
+/**
+ * Check if a date is within market hours
+ */
+function isWithinMarketHours(date, intradayReporting = 'market_hours') {
+    return marketTimeCalculator.isWithinMarketHours(date, intradayReporting);
+}
 /**
  * Function to find complete trading date periods, starting at the beginning of one trading date and ending at the last.
  * By default, it gets the last trading date, returning the beginning and end. But we can also a) define the end date
@@ -780,9 +794,16 @@ function isMarketDay(date) {
 function getTradingStartAndEndDates(options = {}) {
     const { endDate = new Date(), days = 1 } = options;
     // Get the last full trading date for the end date
-    const endTradingDate = getLastFullTradingDate(endDate).date;
-    // Get the market close time for the end date (4:00 PM ET or 1:00 PM on short days)
-    const endMarketClose = getMarketOpenClose({ date: endTradingDate }).close;
+    let endTradingDate;
+    // If within market hours, on a trading day, use the current date as end
+    if (isWithinMarketHours(endDate, 'market_hours')) {
+        endTradingDate = endDate;
+    }
+    else {
+        // If after market hours, use the last full trading date, which should be the previous trading day, or after extended hours, the same trading day
+        const lastFullTradingDate = marketTimeCalculator.getLastFullTradingDate(endDate, false);
+        endTradingDate = getMarketOpenClose({ date: lastFullTradingDate }).close;
+    }
     let startDate;
     if (days <= 1) {
         // For 1 day, start is market open of the same trading day as end
@@ -802,7 +823,7 @@ function getTradingStartAndEndDates(options = {}) {
         // Get the market open time for the start date
         startDate = getMarketOpenClose({ date: currentDate }).open;
     }
-    return { startDate, endDate: endMarketClose };
+    return { startDate, endDate: endTradingDate };
 }
 // Export the MARKET_TIMES constant for backward compatibility
 const MARKET_TIMES = {