@forcecalendar/core 0.3.1 → 1.0.0

package/core/events/EventStore.js

@@ -294,34 +294,47 @@ export class EventStore {
     // Use local date string for the query date (in the calendar's timezone)
     const dateStr = DateUtils.getLocalDateString(date);
 
-    // Get all events indexed for this date
-    const allEvents = [];
+    // Collect candidate event IDs from indices
+    const candidateIds = new Set();
 
-    // Since events might span multiple days in different timezones,
-    // we need to check events from surrounding dates too
+    // Check byDate index for nearby dates (handles most events)
     const checkDate = new Date(date);
     for (let offset = -1; offset <= 1; offset++) {
       const tempDate = new Date(checkDate);
       tempDate.setDate(tempDate.getDate() + offset);
       const tempDateStr = DateUtils.getLocalDateString(tempDate);
-      const eventIds = this.indices.byDate.get(tempDateStr) || new Set();
+      const eventIds = this.indices.byDate.get(tempDateStr);
+      if (eventIds) {
+        eventIds.forEach(id => candidateIds.add(id));
+      }
+    }
 
-      for (const id of eventIds) {
-        const event = this.events.get(id);
-        if (event && !allEvents.find(e => e.id === event.id)) {
-          // Check if event actually occurs on the requested date in the given timezone
-          const eventStartLocal = event.getStartInTimezone(timezone);
-          const eventEndLocal = event.getEndInTimezone(timezone);
-
-          const startOfDay = new Date(date);
-          startOfDay.setHours(0, 0, 0, 0);
-          const endOfDay = new Date(date);
-          endOfDay.setHours(23, 59, 59, 999);
-
-          // Event overlaps with this day if it starts before end of day and ends after start of day
-          if (eventStartLocal <= endOfDay && eventEndLocal >= startOfDay) {
-            allEvents.push(event);
-          }
+    // Also check byMonth index to catch long-running events that might not be
+    // indexed in byDate for this specific date (lazy indexing only indexes
+    // first/last week of multi-week events)
+    const monthKey = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`;
+    const monthEventIds = this.indices.byMonth.get(monthKey);
+    if (monthEventIds) {
+      monthEventIds.forEach(id => candidateIds.add(id));
+    }
+
+    // Filter candidates to events that actually overlap with the requested date
+    const allEvents = [];
+    const startOfDay = new Date(date);
+    startOfDay.setHours(0, 0, 0, 0);
+    const endOfDay = new Date(date);
+    endOfDay.setHours(23, 59, 59, 999);
+
+    for (const id of candidateIds) {
+      const event = this.events.get(id);
+      if (event) {
+        // Check if event actually occurs on the requested date in the given timezone
+        const eventStartLocal = event.getStartInTimezone(timezone);
+        const eventEndLocal = event.getEndInTimezone(timezone);
+
+        // Event overlaps with this day if it starts before end of day and ends after start of day
+        if (eventStartLocal <= endOfDay && eventEndLocal >= startOfDay) {
+          allEvents.push(event);
         }
       }
     }

package/core/events/RRuleParser.js

@@ -122,6 +122,7 @@ export class RRuleParser {
 
     /**
      * Parse BYDAY value
+     * Returns array of strings like ['MO', '2TU', '-1FR'] for compatibility with RecurrenceEngine
      * @private
      */
     static parseByDay(value) {
@@ -130,14 +131,14 @@ export class RRuleParser {
         const result = [];
 
         for (const day of days) {
-            const match = day.match(/^([+-]?\d*)([A-Z]{2})$/);
+            const trimmed = day.trim().toUpperCase();
+            const match = trimmed.match(/^([+-]?\d*)([A-Z]{2})$/);
             if (match) {
                 const [_, nth, weekday] = match;
                 if (weekDays.includes(weekday)) {
-                    result.push({
-                        weekday,
-                        nth: nth ? parseInt(nth, 10) : null
-                    });
+                    // Return string format for RecurrenceEngine compatibility
+                    // e.g., 'MO', '2MO', '-1FR'
+                    result.push(nth ? `${nth}${weekday}` : weekday);
                 }
             }
         }

package/core/events/RecurrenceEngine.js

@@ -108,9 +108,18 @@ export class RecurrenceEngine {
       case 'WEEKLY':
         if (rule.byDay && rule.byDay.length > 0) {
           // Find next day that matches byDay
+          // Limit iterations to prevent infinite loop with malformed byDay
+          const maxIterations = 8; // 7 days + 1 for safety
+          let iterations = 0;
           next.setDate(next.getDate() + 1);
-          while (!this.matchesByDay(next, rule.byDay)) {
+          while (!this.matchesByDay(next, rule.byDay) && iterations < maxIterations) {
             next.setDate(next.getDate() + 1);
+            iterations++;
+          }
+          // If no match found, fall back to simple weekly interval
+          if (iterations >= maxIterations) {
+            console.warn('RecurrenceEngine: Invalid byDay rule, falling back to weekly interval');
+            next.setDate(next.getDate() + (7 * rule.interval) - maxIterations);
           }
         } else {
           // Simple weekly recurrence