@discomedia/utils 1.0.51 → 1.0.52

package/dist/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.51",
+  "version": "1.0.52",
   "author": "Disco Media",
   "description": "Utility functions used in Disco Media apps",
   "always-build-npm": true,

package/dist/test.js

@@ -967,10 +967,13 @@ function countTradingDays(startDate, endDate = new Date()) {
 /**
  * Returns the trading day N days back from a reference date, along with its market open time.
  * Trading days are counted as full or half trading days (days that end count as 1 full trading day).
+ * By default, the most recent completed trading day counts as day 1.
+ * Set includeMostRecentFullDay to false to count strictly before that day.
  *
  * @param options - Object with:
  *   - referenceDate: Date to count back from (default: now)
- *   - days: Number of trading days to go back (must be >= 1)
+ *   - days: Number of trading days to go back (must be an integer >= 1)
+ *   - includeMostRecentFullDay: Whether to include the most recent completed trading day (default: true)
  * @returns Object containing:
  *   - date: Trading date in YYYY-MM-DD format
  *   - marketOpenISO: Market open time as ISO string (e.g., "2025-11-15T13:30:00.000Z")
@@ -992,13 +995,17 @@ function countTradingDays(startDate, endDate = new Date()) {
  */
 function getTradingDaysBack(options) {
     const calendar = new MarketCalendar();
-    const refDate = options.referenceDate || new Date();
-    const daysBack = options.days;
-    if (daysBack < 1) {
-        throw new Error('days must be at least 1');
+    const { referenceDate, days, includeMostRecentFullDay = true } = options;
+    const refDate = referenceDate || new Date();
+    const daysBack = days;
+    if (!Number.isInteger(daysBack) || daysBack < 1) {
+        throw new Error('days must be an integer >= 1');
     }
     // Start from the last full trading date relative to reference
     let targetDate = getLastFullTradingDateImpl(refDate);
+    if (!includeMostRecentFullDay) {
+        targetDate = calendar.getPreviousMarketDay(targetDate);
+    }
     // Go back the specified number of days (we're already at day 1, so go back days-1 more)
     for (let i = 1; i < daysBack; i++) {
         targetDate = calendar.getPreviousMarketDay(targetDate);
@@ -19642,12 +19649,32 @@ function testGetTradingDaysBack() {
                 marketOpenISO: '2025-07-03T13:30:00.000Z', // Still opens at normal time
             },
         },
+        {
+            label: '1 day back from Friday after close (exclude most recent full day)',
+            referenceDate: '2025-07-11T18:00:00-04:00',
+            days: 1,
+            includeMostRecentFullDay: false,
+            expected: {
+                date: '2025-07-10',
+                marketOpenISO: '2025-07-10T13:30:00.000Z',
+            },
+        },
+        {
+            label: '3 days back from Monday after close (exclude most recent full day)',
+            referenceDate: '2025-07-14T18:00:00-04:00',
+            days: 3,
+            includeMostRecentFullDay: false,
+            expected: {
+                date: '2025-07-09',
+                marketOpenISO: '2025-07-09T13:30:00.000Z',
+            },
+        },
     ];
     console.log('\n=== Testing getTradingDaysBack ===\n');
-    for (const { label, referenceDate, days, expected } of testCases) {
+    for (const { label, referenceDate, days, includeMostRecentFullDay, expected } of testCases) {
         try {
             const refDate = new Date(referenceDate);
-            const result = disco.time.getTradingDaysBack({ referenceDate: refDate, days });
+            const result = disco.time.getTradingDaysBack({ referenceDate: refDate, days, includeMostRecentFullDay });
             const dateMatches = result.date === expected.date;
             const isoMatches = result.marketOpenISO === expected.marketOpenISO;
             const unixValid = typeof result.unixTimestamp === 'number' && result.unixTimestamp > 0;
@@ -19678,7 +19705,11 @@ function testGetTradingDaysBack() {
     const passedTests = testCases.filter((tc) => {
         try {
             const refDate = new Date(tc.referenceDate);
-            const result = disco.time.getTradingDaysBack({ referenceDate: refDate, days: tc.days });
+            const result = disco.time.getTradingDaysBack({
+                referenceDate: refDate,
+                days: tc.days,
+                includeMostRecentFullDay: tc.includeMostRecentFullDay,
+            });
             return result.date === tc.expected.date && result.marketOpenISO === tc.expected.marketOpenISO;
         }
         catch {