@discomedia/utils 1.0.20 → 1.0.21

package/dist/index.cjs

@@ -282,7 +282,7 @@ class MarketCalendar {
         const yearHolidays = marketHolidays[year];
         if (!yearHolidays)
             return false;
-        return Object.values(yearHolidays).some(holiday => holiday.date === formattedDate);
+        return Object.values(yearHolidays).some((holiday) => holiday.date === formattedDate);
     }
     /**
      * Checks if a date is an early close day in NY time.
@@ -398,7 +398,7 @@ function getMarketTimes(date) {
  * @param intradayReporting - 'market_hours', 'extended_hours', or 'continuous'
  * @returns true if within hours, false otherwise
  */
-function isWithinMarketHoursImpl(date, intradayReporting = 'market_hours') {
+function isWithinMarketHours(date, intradayReporting = 'market_hours') {
     const calendar = new MarketCalendar();
     if (!calendar.isMarketDay(date))
         return false;
@@ -441,7 +441,9 @@ function getLastFullTradingDateImpl(currentDate = new Date()) {
         marketCloseMinutes = MARKET_CONFIG.TIMES.EARLY_CLOSE.hour * 60 + MARKET_CONFIG.TIMES.EARLY_CLOSE.minute;
     }
     // If not a market day, or before open, or during market hours, return previous market day's close
-    if (!calendar.isMarketDay(currentDate) || minutes < marketOpenMinutes || (minutes >= marketOpenMinutes && minutes < marketCloseMinutes)) {
+    if (!calendar.isMarketDay(currentDate) ||
+        minutes < marketOpenMinutes ||
+        (minutes >= marketOpenMinutes && minutes < marketCloseMinutes)) {
         const prevMarketDay = calendar.getPreviousMarketDay(currentDate);
         let prevCloseMinutes = MARKET_CONFIG.TIMES.MARKET_CLOSE.hour * 60 + MARKET_CONFIG.TIMES.MARKET_CLOSE.minute;
         if (calendar.isEarlyCloseDay(prevMarketDay)) {
@@ -557,7 +559,7 @@ function calculatePeriodStartDate(endDate, period) {
  * @returns PeriodDates object
  */
 function getMarketTimePeriod(params) {
-    const { period, end = new Date(), intraday_reporting = 'market_hours', outputFormat = 'iso', } = params;
+    const { period, end = new Date(), intraday_reporting = 'market_hours', outputFormat = 'iso' } = params;
     if (!period)
         throw new Error('Period is required');
     const calendar = new MarketCalendar();
@@ -620,7 +622,8 @@ function getMarketStatusImpl(date = new Date()) {
     let extendedEndMinutes = MARKET_CONFIG.TIMES.EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EXTENDED_END.minute;
     if (isEarlyCloseDay) {
         marketCloseMinutes = MARKET_CONFIG.TIMES.EARLY_CLOSE.hour * 60 + MARKET_CONFIG.TIMES.EARLY_CLOSE.minute;
-        extendedEndMinutes = MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.minute;
+        extendedEndMinutes =
+            MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.hour * 60 + MARKET_CONFIG.TIMES.EARLY_EXTENDED_END.minute;
     }
     let status;
     let nextStatus;
@@ -716,15 +719,36 @@ function getLastFullTradingDate(currentDate = new Date()) {
  */
 function getNextMarketDay({ referenceDate } = {}) {
     const calendar = new MarketCalendar();
-    const startDate = referenceDate || new Date();
+    const startDate = referenceDate ?? new Date();
+    // Find the next trading day (UTC Date object)
     const nextDate = calendar.getNextMarketDay(startDate);
-    const yyyymmdd = `${nextDate.getUTCFullYear()}-${String(nextDate.getUTCMonth() + 1).padStart(2, '0')}-${String(nextDate.getUTCDate()).padStart(2, '0')}`;
+    // Convert to NY time before extracting Y-M-D parts
+    const nyNext = toNYTime(nextDate);
+    const yyyymmdd = `${nyNext.getUTCFullYear()}-${String(nyNext.getUTCMonth() + 1).padStart(2, '0')}-${String(nyNext.getUTCDate()).padStart(2, '0')}`;
     return {
-        date: nextDate,
-        yyyymmdd,
+        date: nextDate, // raw Date, unchanged
+        yyyymmdd, // correct trading date string
         dateISOString: nextDate.toISOString(),
     };
 }
+/**
+ * Returns the previous market day before the reference date.
+ * @param referenceDate - Date object (default: now)
+ * @returns Object with date, yyyymmdd string, and ISO string
+ */
+function getPreviousMarketDay({ referenceDate } = {}) {
+    const calendar = new MarketCalendar();
+    const startDate = referenceDate || new Date();
+    const prevDate = calendar.getPreviousMarketDay(startDate);
+    // convert to NY time first
+    const nyPrev = toNYTime(prevDate); // ← already in this file
+    const yyyymmdd = `${nyPrev.getUTCFullYear()}-${String(nyPrev.getUTCMonth() + 1).padStart(2, '0')}-${String(nyPrev.getUTCDate()).padStart(2, '0')}`;
+    return {
+        date: prevDate,
+        yyyymmdd,
+        dateISOString: prevDate.toISOString(),
+    };
+}
 /**
  * Returns the trading date for a given time. Note: Just trims the date string; does not validate if the date is a market day.
  * @param time - a string, number (unix timestamp), or Date object representing the time
@@ -759,13 +783,13 @@ function getMarketStatus(options = {}) {
     return getMarketStatusImpl(date);
 }
 /**
- * Checks if a date/time is within market hours, extended hours, or continuous.
+ * Checks if a date is a market day.
  * @param date - Date object
- * @param intradayReporting - 'market_hours', 'extended_hours', or 'continuous'
- * @returns true if within hours, false otherwise
+ * @returns true if market day, false otherwise
  */
-function isWithinMarketHours(date, intradayReporting = 'market_hours') {
-    return isWithinMarketHoursImpl(date, intradayReporting);
+function isMarketDay(date) {
+    const calendar = new MarketCalendar();
+    return calendar.isMarketDay(date);
 }
 /**
  * Returns full trading days from market open to market close.
@@ -786,7 +810,9 @@ function getTradingStartAndEndDates(options = {}) {
     const marketOpenMinutes = MARKET_CONFIG.TIMES.MARKET_OPEN.hour * 60 + MARKET_CONFIG.TIMES.MARKET_OPEN.minute;
     const marketCloseMinutes = MARKET_CONFIG.TIMES.MARKET_CLOSE.hour * 60 + MARKET_CONFIG.TIMES.MARKET_CLOSE.minute;
     const minutes = nyEnd.getUTCHours() * 60 + nyEnd.getUTCMinutes();
-    if (!calendar.isMarketDay(endDate) || minutes < marketOpenMinutes || (minutes >= marketOpenMinutes && minutes < marketCloseMinutes)) {
+    if (!calendar.isMarketDay(endDate) ||
+        minutes < marketOpenMinutes ||
+        (minutes >= marketOpenMinutes && minutes < marketCloseMinutes)) {
         // Before market open, not a market day, or during market hours: use previous market day
         endMarketDay = calendar.getPreviousMarketDay(endDate);
     }
@@ -879,7 +905,7 @@ function countTradingDays(startDate, endDate = new Date()) {
     return {
         days: Math.round(days * 1000) / 1000, // Round to 3 decimal places
         hours: Math.round(hours * 100) / 100, // Round to 2 decimal places
-        minutes: Math.round(minutes)
+        minutes: Math.round(minutes),
     };
 }
 // Export MARKET_TIMES for compatibility
@@ -887,27 +913,27 @@ const MARKET_TIMES = {
     TIMEZONE: MARKET_CONFIG.TIMEZONE,
     PRE: {
         START: { HOUR: 4, MINUTE: 0, MINUTES: 240 },
-        END: { HOUR: 9, MINUTE: 30, MINUTES: 570 }
+        END: { HOUR: 9, MINUTE: 30, MINUTES: 570 },
     },
     EARLY_MORNING: {
         START: { HOUR: 9, MINUTE: 30, MINUTES: 570 },
-        END: { HOUR: 10, MINUTE: 0, MINUTES: 600 }
+        END: { HOUR: 10, MINUTE: 0, MINUTES: 600 },
     },
     EARLY_CLOSE_BEFORE_HOLIDAY: {
         START: { HOUR: 9, MINUTE: 30, MINUTES: 570 },
-        END: { HOUR: 13, MINUTE: 0, MINUTES: 780 }
+        END: { HOUR: 13, MINUTE: 0, MINUTES: 780 },
     },
     EARLY_EXTENDED_BEFORE_HOLIDAY: {
         START: { HOUR: 13, MINUTE: 0, MINUTES: 780 },
-        END: { HOUR: 17, MINUTE: 0, MINUTES: 1020 }
+        END: { HOUR: 17, MINUTE: 0, MINUTES: 1020 },
     },
     REGULAR: {
         START: { HOUR: 9, MINUTE: 30, MINUTES: 570 },
-        END: { HOUR: 16, MINUTE: 0, MINUTES: 960 }
+        END: { HOUR: 16, MINUTE: 0, MINUTES: 960 },
     },
     EXTENDED: {
         START: { HOUR: 4, MINUTE: 0, MINUTES: 240 },
-        END: { HOUR: 20, MINUTE: 0, MINUTES: 1200 }
+        END: { HOUR: 20, MINUTE: 0, MINUTES: 1200 },
     },
 };
 
@@ -18270,10 +18296,14 @@ const disco = {
         getMarketOpenClose: getMarketOpenClose,
         getLastFullTradingDate: getLastFullTradingDate,
         getNextMarketDay: getNextMarketDay,
+        getPreviousMarketDay: getPreviousMarketDay,
+        getMarketTimePeriod: getMarketTimePeriod,
         getMarketStatus: getMarketStatus,
         getNYTimeZone: getNYTimeZone,
         getTradingDate: getTradingDate,
         getTradingStartAndEndDates: getTradingStartAndEndDates,
+        isMarketDay: isMarketDay,
+        isWithinMarketHours: isWithinMarketHours,
         countTradingDays: countTradingDays,
         MARKET_TIMES: MARKET_TIMES,
     },