@forcecalendar/core 2.1.65 → 2.1.67

package/core/events/EventStore.js

@@ -1,6 +1,6 @@
 import { Event } from './Event.js';
 import { DateUtils } from '../calendar/DateUtils.js';
-import { RecurrenceEngine } from './RecurrenceEngine.js';
+import { RecurrenceEngineV2 } from './RecurrenceEngineV2.js';
 import { PerformanceOptimizer } from '../performance/PerformanceOptimizer.js';
 import { ConflictDetector } from '../conflicts/ConflictDetector.js';
 import { TimezoneManager } from '../timezone/TimezoneManager.js';
@@ -29,6 +29,7 @@ export class EventStore {
       /** @type {Map<string, Set<string>>} Status -> Set of event IDs */
       byStatus: new Map()
     };
+    this.eventIndexRefs = new Map();
 
     // Timezone manager for conversions (use singleton to share cache)
     this.timezoneManager = TimezoneManager.getInstance();
@@ -39,6 +40,9 @@ export class EventStore {
     // Performance optimizer
     this.optimizer = new PerformanceOptimizer(config.performance);
 
+    // Recurrence expansion engine
+    this.recurrenceEngine = config.recurrenceEngine || new RecurrenceEngineV2();
+
     // Conflict detector
     this.conflictDetector = new ConflictDetector(this);
 
@@ -334,9 +338,6 @@ export class EventStore {
   getEventsForDate(date, timezone = null) {
     timezone = timezone || this.defaultTimezone;
 
-    // Use local date string for the query date (in the calendar's timezone)
-    const dateStr = DateUtils.getLocalDateString(date);
-
     // Collect candidate event IDs from indices
     const candidateIds = new Set();
 
@@ -409,23 +410,40 @@ export class EventStore {
 
     // Collect all events from those dates
     const checkedIds = new Set();
-    dates.forEach(date => {
-      // Use getLocalDateString to match the index key format (YYYY-MM-DD)
-      const dateStr = DateUtils.getLocalDateString(date);
-      const eventIds = this.indices.byDate.get(dateStr) || new Set();
+    const addCandidateIds = eventIds => {
+      if (!eventIds) return;
 
       eventIds.forEach(id => {
         if (!checkedIds.has(id) && id !== excludeId) {
           checkedIds.add(id);
-          const event = this.events.get(id);
-
-          if (event && event.overlaps({ start, end })) {
-            overlapping.push(event);
-          }
         }
       });
+    };
+
+    dates.forEach(date => {
+      // Use getLocalDateString to match the index key format (YYYY-MM-DD)
+      const dateStr = DateUtils.getLocalDateString(date);
+      addCandidateIds(this.indices.byDate.get(dateStr));
     });
 
+    // Lazy-indexed long events may not have every day in byDate. Use month
+    // buckets as candidates and rely on precise overlap filtering below.
+    const currentMonth = new Date(startDate.getFullYear(), startDate.getMonth(), 1);
+    const endMonth = new Date(endDate.getFullYear(), endDate.getMonth(), 1);
+    while (currentMonth <= endMonth) {
+      const monthKey = `${currentMonth.getFullYear()}-${String(currentMonth.getMonth() + 1).padStart(2, '0')}`;
+      addCandidateIds(this.indices.byMonth.get(monthKey));
+      currentMonth.setMonth(currentMonth.getMonth() + 1);
+    }
+
+    for (const id of checkedIds) {
+      const event = this.events.get(id);
+
+      if (event && event.overlaps({ start, end })) {
+        overlapping.push(event);
+      }
+    }
+
     return overlapping.sort((a, b) => a.start - b.start);
   }
 
@@ -579,6 +597,20 @@ export class EventStore {
       return baseEvents;
     }
 
+    // Recurring series can start before the requested range but still have
+    // occurrences inside it, so include all recurring series as expansion
+    // candidates and let the recurrence engine filter by range.
+    const baseEventIds = new Set(baseEvents.map(event => event.id));
+    for (const eventId of this.indices.recurring) {
+      if (!baseEventIds.has(eventId)) {
+        const event = this.events.get(eventId);
+        if (event) {
+          baseEvents.push(event);
+          baseEventIds.add(eventId);
+        }
+      }
+    }
+
     // Expand recurring events
     const expandedEvents = [];
     baseEvents.forEach(event => {
@@ -615,7 +647,9 @@ export class EventStore {
 
     // Expand in the event's timezone for accurate recurrence calculation
     const eventTimezone = event.timeZone || timezone;
-    const occurrences = RecurrenceEngine.expandEvent(event, rangeStart, rangeEnd);
+    const occurrences = this.recurrenceEngine.expandEvent(event, rangeStart, rangeEnd, {
+      timezone: eventTimezone
+    });
 
     return occurrences.map((occurrence, index) => {
       // Create a new event instance for each occurrence
@@ -623,10 +657,11 @@ export class EventStore {
         id: `${event.id}_occurrence_${index}`,
         start: occurrence.start,
         end: occurrence.end,
-        timeZone: eventTimezone,
+        timeZone: occurrence.timezone || eventTimezone,
         metadata: {
           ...event.metadata,
           recurringEventId: event.id,
+          occurrenceId: occurrence.id,
           occurrenceIndex: index
         }
       });
@@ -647,6 +682,7 @@ export class EventStore {
     this.indices.recurring.clear();
     this.indices.byCategory.clear();
     this.indices.byStatus.clear();
+    this.eventIndexRefs.clear();
 
     this._notifyChange({
       type: 'clear',
@@ -687,6 +723,8 @@ export class EventStore {
    * @private
    */
   _indexEvent(event) {
+    this._createIndexRefs(event.id);
+
     // Check if should use lazy indexing for large date ranges
     if (this.optimizer.shouldUseLazyIndexing(event)) {
       this._indexEventLazy(event);
@@ -706,26 +744,14 @@ export class EventStore {
 
     dates.forEach(date => {
       const dateStr = DateUtils.getLocalDateString(date);
-
-      if (!this.indices.byDate.has(dateStr)) {
-        this.indices.byDate.set(dateStr, new Set());
-      }
-      this.indices.byDate.get(dateStr).add(event.id);
+      this._addToKeyedIndex('byDate', dateStr, event.id);
     });
 
-    // Index by month(s) using UTC
-    const startMonth = `${startDate.getFullYear()}-${String(startDate.getMonth() + 1).padStart(2, '0')}`;
-    const endMonth = `${endDate.getFullYear()}-${String(endDate.getMonth() + 1).padStart(2, '0')}`;
-
     // Add to all months the event spans
     const currentMonth = new Date(startDate.getFullYear(), startDate.getMonth(), 1);
     while (currentMonth <= endDate) {
       const monthKey = `${currentMonth.getFullYear()}-${String(currentMonth.getMonth() + 1).padStart(2, '0')}`;
-
-      if (!this.indices.byMonth.has(monthKey)) {
-        this.indices.byMonth.set(monthKey, new Set());
-      }
-      this.indices.byMonth.get(monthKey).add(event.id);
+      this._addToKeyedIndex('byMonth', monthKey, event.id);
 
       currentMonth.setMonth(currentMonth.getMonth() + 1);
     }
@@ -733,24 +759,19 @@ export class EventStore {
     // Index by categories
     if (event.categories && event.categories.length > 0) {
       event.categories.forEach(category => {
-        if (!this.indices.byCategory.has(category)) {
-          this.indices.byCategory.set(category, new Set());
-        }
-        this.indices.byCategory.get(category).add(event.id);
+        this._addToKeyedIndex('byCategory', category, event.id);
       });
     }
 
     // Index by status
     if (event.status) {
-      if (!this.indices.byStatus.has(event.status)) {
-        this.indices.byStatus.set(event.status, new Set());
-      }
-      this.indices.byStatus.get(event.status).add(event.id);
+      this._addToKeyedIndex('byStatus', event.status, event.id);
     }
 
     // Index recurring events
     if (event.recurring) {
       this.indices.recurring.add(event.id);
+      this.eventIndexRefs.get(event.id).recurring = true;
     }
   }
 
@@ -759,8 +780,7 @@ export class EventStore {
    * @private
    */
   _indexEventLazy(event) {
-    // Create lazy index markers
-    const markers = this.optimizer.createLazyIndexMarkers(event);
+    this.optimizer.createLazyIndexMarkers(event);
 
     // Index only the boundaries initially (in event's local timezone)
     const eventStartLocal = event.getStartInTimezone(event.timeZone);
@@ -779,10 +799,7 @@ export class EventStore {
 
     firstWeekDates.forEach(date => {
       const dateStr = DateUtils.getLocalDateString(date);
-      if (!this.indices.byDate.has(dateStr)) {
-        this.indices.byDate.set(dateStr, new Set());
-      }
-      this.indices.byDate.get(dateStr).add(event.id);
+      this._addToKeyedIndex('byDate', dateStr, event.id);
     });
 
     // Index last week if different from first
@@ -796,10 +813,7 @@ export class EventStore {
 
       lastWeekDates.forEach(date => {
         const dateStr = DateUtils.getLocalDateString(date);
-        if (!this.indices.byDate.has(dateStr)) {
-          this.indices.byDate.set(dateStr, new Set());
-        }
-        this.indices.byDate.get(dateStr).add(event.id);
+        this._addToKeyedIndex('byDate', dateStr, event.id);
       });
     }
 
@@ -807,33 +821,53 @@ export class EventStore {
     const currentMonth = new Date(startDate.getFullYear(), startDate.getMonth(), 1);
     while (currentMonth <= endDate) {
       const monthKey = `${currentMonth.getFullYear()}-${String(currentMonth.getMonth() + 1).padStart(2, '0')}`;
-      if (!this.indices.byMonth.has(monthKey)) {
-        this.indices.byMonth.set(monthKey, new Set());
-      }
-      this.indices.byMonth.get(monthKey).add(event.id);
+      this._addToKeyedIndex('byMonth', monthKey, event.id);
       currentMonth.setMonth(currentMonth.getMonth() + 1);
     }
 
     // Index other properties normally
     if (event.categories && event.categories.length > 0) {
       event.categories.forEach(category => {
-        if (!this.indices.byCategory.has(category)) {
-          this.indices.byCategory.set(category, new Set());
-        }
-        this.indices.byCategory.get(category).add(event.id);
+        this._addToKeyedIndex('byCategory', category, event.id);
       });
     }
 
     if (event.status) {
-      if (!this.indices.byStatus.has(event.status)) {
-        this.indices.byStatus.set(event.status, new Set());
-      }
-      this.indices.byStatus.get(event.status).add(event.id);
+      this._addToKeyedIndex('byStatus', event.status, event.id);
     }
 
     if (event.recurring) {
       this.indices.recurring.add(event.id);
+      this.eventIndexRefs.get(event.id).recurring = true;
+    }
+  }
+
+  /**
+   * Create reverse index references for an event.
+   * @private
+   */
+  _createIndexRefs(eventId) {
+    this.eventIndexRefs.set(eventId, {
+      byDate: new Set(),
+      byMonth: new Set(),
+      byCategory: new Set(),
+      byStatus: new Set(),
+      recurring: false
+    });
+  }
+
+  /**
+   * Add an event to a keyed index and record the reverse reference.
+   * @private
+   */
+  _addToKeyedIndex(indexName, key, eventId) {
+    const index = this.indices[indexName];
+    if (!index.has(key)) {
+      index.set(key, new Set());
     }
+
+    index.get(key).add(eventId);
+    this.eventIndexRefs.get(eventId)?.[indexName].add(key);
   }
 
   /**
@@ -841,6 +875,22 @@ export class EventStore {
    * @private
    */
   _unindexEvent(event) {
+    const refs = this.eventIndexRefs.get(event.id);
+
+    if (refs) {
+      this._removeFromReferencedIndex('byDate', refs.byDate, event.id);
+      this._removeFromReferencedIndex('byMonth', refs.byMonth, event.id);
+      this._removeFromReferencedIndex('byCategory', refs.byCategory, event.id);
+      this._removeFromReferencedIndex('byStatus', refs.byStatus, event.id);
+
+      if (refs.recurring) {
+        this.indices.recurring.delete(event.id);
+      }
+
+      this.eventIndexRefs.delete(event.id);
+      return;
+    }
+
     // Remove from date indices
     for (const [dateStr, eventIds] of this.indices.byDate) {
       eventIds.delete(event.id);
@@ -877,6 +927,24 @@ export class EventStore {
     this.indices.recurring.delete(event.id);
   }
 
+  /**
+   * Remove an event from only the keys it was indexed into.
+   * @private
+   */
+  _removeFromReferencedIndex(indexName, keys, eventId) {
+    const index = this.indices[indexName];
+
+    for (const key of keys) {
+      const eventIds = index.get(key);
+      if (!eventIds) continue;
+
+      eventIds.delete(eventId);
+      if (eventIds.size === 0) {
+        index.delete(key);
+      }
+    }
+  }
+
   /**
    * Notify listeners of changes
    * @private
@@ -938,6 +1006,18 @@ export class EventStore {
             Array.from(this.indices.byStatus.entries()).map(([k, v]) => [k, new Set(v)])
           )
         },
+        eventIndexRefs: new Map(
+          Array.from(this.eventIndexRefs.entries()).map(([eventId, refs]) => [
+            eventId,
+            {
+              byDate: new Set(refs.byDate),
+              byMonth: new Set(refs.byMonth),
+              byCategory: new Set(refs.byCategory),
+              byStatus: new Set(refs.byStatus),
+              recurring: refs.recurring
+            }
+          ])
+        ),
         version: this.version
       };
     }
@@ -981,6 +1061,7 @@ export class EventStore {
     if (this.batchBackup) {
       this.events = this.batchBackup.events;
       this.indices = this.batchBackup.indices;
+      this.eventIndexRefs = this.batchBackup.eventIndexRefs;
       this.version = this.batchBackup.version;
       this.batchBackup = null;
 
@@ -1154,7 +1235,6 @@ export class EventStore {
       cutoffDate.setMonth(cutoffDate.getMonth() - 6); // Default: 6 months ago
     }
 
-    const cutoffStr = cutoffDate.toDateString();
     let removed = 0;
 
     // Clean up date indices
@@ -1172,13 +1252,15 @@ export class EventStore {
         }
 
         if (!stillNeeded) {
+          for (const eventId of eventIds) {
+            this.eventIndexRefs.get(eventId)?.byDate.delete(dateStr);
+          }
           this.indices.byDate.delete(dateStr);
           removed++;
         }
       }
     }
 
-    console.log(`Optimized indices: removed ${removed} old date entries`);
     return removed;
   }
 

package/core/events/RecurrenceEngineV2.js

@@ -48,11 +48,11 @@ export class RecurrenceEngineV2 {
     // Check cache
     const cacheKey = this.getCacheKey(event.id, rangeStart, rangeEnd, options);
     if (this.occurrenceCache.has(cacheKey)) {
-      return this.occurrenceCache.get(cacheKey);
+      return this.cloneOccurrences(this.occurrenceCache.get(cacheKey));
     }
 
     if (!event.recurring || !event.recurrenceRule) {
-      return [this.createOccurrence(event, event.start, event.end)];
+      return this.cloneOccurrences([this.createOccurrence(event, event.start, event.end)]);
     }
 
     const rule = RRuleParser.parse(event.recurrenceRule);
@@ -64,7 +64,8 @@ export class RecurrenceEngineV2 {
       currentDate: new Date(event.start),
       count: 0,
       tzOffsets: new Map(),
-      dstTransitions: []
+      dstTransitions: [],
+      stuckIterations: 0
     };
 
     // Pre-calculate DST transitions in range
@@ -85,21 +86,20 @@ export class RecurrenceEngineV2 {
 
         // Check exceptions and modifications
         if (occurrence) {
-          const dateKey = this.getDateKey(occurrence.start);
+          let shouldInclude = true;
 
           // Skip if exception
           if (this.isException(event.id, occurrence.start, rule)) {
             if (!includeCancelled) {
-              state.currentDate = this.getNextDate(state.currentDate, rule, timezone);
-              state.count++;
-              continue;
+              shouldInclude = false;
+            } else {
+              occurrence.status = 'cancelled';
+              occurrence.cancellationReason = this.getExceptionReason(event.id, occurrence.start);
             }
-            occurrence.status = 'cancelled';
-            occurrence.cancellationReason = this.getExceptionReason(event.id, occurrence.start);
           }
 
           // Apply modifications if any
-          if (includeModified) {
+          if (shouldInclude && includeModified) {
             const modified = this.getModifiedInstance(event.id, occurrence.start);
             if (modified) {
               Object.assign(occurrence, modified);
@@ -107,14 +107,26 @@ export class RecurrenceEngineV2 {
             }
           }
 
-          occurrences.push(occurrence);
+          if (shouldInclude) {
+            occurrences.push(occurrence);
+          }
         }
       }
 
       // Get next occurrence date
+      const previousTimestamp = state.currentDate.getTime();
       state.currentDate = this.getNextDate(state.currentDate, rule, timezone, state);
       state.count++;
 
+      if (state.currentDate.getTime() <= previousTimestamp) {
+        state.stuckIterations++;
+        if (state.stuckIterations >= 3) {
+          break;
+        }
+      } else {
+        state.stuckIterations = 0;
+      }
+
       // Check COUNT limit
       if (rule.count && state.count >= rule.count) {
         break;
@@ -129,7 +141,7 @@ export class RecurrenceEngineV2 {
     // Cache results
     this.cacheOccurrences(cacheKey, occurrences);
 
-    return occurrences;
+    return this.cloneOccurrences(occurrences);
   }
 
   /**
@@ -169,7 +181,7 @@ export class RecurrenceEngineV2 {
   /**
    * Get next occurrence date with complex pattern support
    */
-  getNextDate(currentDate, rule, timezone, state = {}) {
+  getNextDate(currentDate, rule, timezone, _state = {}) {
     const next = new Date(currentDate);
 
     switch (rule.freq) {
@@ -226,7 +238,7 @@ export class RecurrenceEngineV2 {
   /**
    * Get next weekly occurrence with BYDAY support
    */
-  getNextWeekly(date, rule, timezone) {
+  getNextWeekly(date, rule, _timezone) {
     const next = new Date(date);
 
     if (rule.byDay && rule.byDay.length > 0) {
@@ -276,7 +288,7 @@ export class RecurrenceEngineV2 {
   /**
    * Get next monthly occurrence with complex patterns
    */
-  getNextMonthly(date, rule, timezone) {
+  getNextMonthly(date, rule, _timezone) {
     const next = new Date(date);
 
     if (rule.byMonthDay && rule.byMonthDay.length > 0) {
@@ -372,7 +384,7 @@ export class RecurrenceEngineV2 {
   /**
    * Get next yearly occurrence
    */
-  getNextYearly(date, rule, timezone) {
+  getNextYearly(date, rule, _timezone) {
     const next = new Date(date);
 
     if (rule.byMonth && rule.byMonth.length > 0) {
@@ -617,7 +629,7 @@ export class RecurrenceEngineV2 {
    * Cache occurrences
    */
   cacheOccurrences(key, occurrences) {
-    this.occurrenceCache.set(key, occurrences);
+    this.occurrenceCache.set(key, this.cloneOccurrences(occurrences));
 
     // LRU eviction
     if (this.occurrenceCache.size > this.cacheSize) {
@@ -626,6 +638,25 @@ export class RecurrenceEngineV2 {
     }
   }
 
+  /**
+   * Clone occurrence results before returning or caching.
+   */
+  cloneOccurrences(occurrences) {
+    return occurrences.map(occurrence => ({
+      ...occurrence,
+      start: occurrence.start ? new Date(occurrence.start) : occurrence.start,
+      end: occurrence.end ? new Date(occurrence.end) : occurrence.end,
+      startUTC: occurrence.startUTC ? new Date(occurrence.startUTC) : occurrence.startUTC,
+      endUTC: occurrence.endUTC ? new Date(occurrence.endUTC) : occurrence.endUTC,
+      originalStart: occurrence.originalStart
+        ? new Date(occurrence.originalStart)
+        : occurrence.originalStart,
+      categories: Array.isArray(occurrence.categories)
+        ? [...occurrence.categories]
+        : occurrence.categories
+    }));
+  }
+
   /**
    * Clear cache for specific event
    */

package/core/index.js

@@ -28,7 +28,7 @@ export { RRuleParser } from './events/RRuleParser.js';
 export { EnhancedCalendar } from './integration/EnhancedCalendar.js';
 
 // Version — keep in sync with package.json
-export const VERSION = '2.1.65';
+export const VERSION = '2.1.67';
 
 // Default export
 export { Calendar as default } from './calendar/Calendar.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forcecalendar/core",
-  "version": "2.1.65",
+  "version": "2.1.67",
   "type": "module",
   "private": false,
   "description": "A modern, lightweight, framework-agnostic calendar engine optimized for Salesforce",