@forcecalendar/core 2.1.5 → 2.1.7

package/core/events/Event.js

@@ -59,6 +59,15 @@ export class Event {
 
     normalized.attachments = Array.isArray(normalized.attachments) ? normalized.attachments : [];
 
+    // Backward compatibility: support legacy "recurrence" alias.
+    // Canonical fields are "recurring" + "recurrenceRule".
+    if (normalized.recurrence && !normalized.recurrenceRule) {
+      normalized.recurrenceRule = normalized.recurrence;
+    }
+    if (normalized.recurrenceRule) {
+      normalized.recurring = true;
+    }
+
     // Normalize status and visibility
     const validStatuses = ['confirmed', 'tentative', 'cancelled'];
     if (!validStatuses.includes(normalized.status)) {
@@ -172,6 +181,7 @@ export class Event {
     textColor = null,
     recurring = false,
     recurrenceRule = null,
+    recurrence = null, // Backward-compatible alias for recurrenceRule
     timeZone = null,
     endTimeZone = null,
     status = 'confirmed',
@@ -201,6 +211,7 @@ export class Event {
       textColor,
       recurring,
       recurrenceRule,
+      recurrence,
       timeZone,
       endTimeZone,
       status,
@@ -390,6 +401,14 @@ export class Event {
     return this.recurring && this.recurrenceRule !== null;
   }
 
+  /**
+   * Backward-compatible alias for recurrenceRule
+   * @returns {import('../../types.js').RecurrenceRule|string|null}
+   */
+  get recurrence() {
+    return this.recurrenceRule;
+  }
+
   /**
    * Check if event occurs on a specific date
    * @param {Date|string} date - The date to check
@@ -471,6 +490,7 @@ export class Event {
       textColor: this.textColor,
       recurring: this.recurring,
       recurrenceRule: this.recurrenceRule,
+      recurrence: this.recurrenceRule,
       timeZone: this.timeZone,
       status: this.status,
       visibility: this.visibility,

package/core/ics/ICSHandler.js

@@ -133,7 +133,7 @@ export class ICSHandler {
     if (expandRecurring) {
       events = this.expandRecurringEvents(events, dateRange);
     } else if (!includeRecurring) {
-      events = events.filter(event => !event.recurrence);
+      events = events.filter(event => !(event.recurring || event.recurrenceRule || event.recurrence));
     }
 
     // Generate ICS
@@ -300,7 +300,7 @@ export class ICSHandler {
     const rangeEnd = dateRange?.end || new Date(Date.now() + 365 * 24 * 60 * 60 * 1000);
 
     for (const event of events) {
-      if (!event.recurrence) {
+      if (!(event.recurring || event.recurrenceRule || event.recurrence)) {
         expanded.push(event);
         continue;
       }
@@ -321,6 +321,8 @@ export class ICSHandler {
           id: `${event.id}-${instance.start.getTime()}`,
           start: instance.start,
           end: instance.end,
+          recurring: false,
+          recurrenceRule: null,
           recurrence: null, // Remove recurrence from instances
           parentId: event.id // Reference to original
         });

package/core/ics/ICSParser.js

@@ -22,7 +22,7 @@ export class ICSParser {
       TRANSP: 'showAs',
       ORGANIZER: 'organizer',
       ATTENDEE: 'attendees',
-      RRULE: 'recurrence',
+      RRULE: 'recurrenceRule',
       EXDATE: 'excludeDates'
     };
   }
@@ -184,17 +184,18 @@ export class ICSParser {
     }
 
     // Recurrence
-    if (event.recurrence) {
-      if (typeof event.recurrence === 'string') {
+    const recurrenceRule = event.recurrenceRule || event.recurrence;
+    if (recurrenceRule) {
+      if (typeof recurrenceRule === 'string') {
         // Already in RRULE format
-        if (event.recurrence.startsWith('RRULE:')) {
-          lines.push(event.recurrence);
+        if (recurrenceRule.startsWith('RRULE:')) {
+          lines.push(recurrenceRule);
         } else {
-          lines.push(`RRULE:${event.recurrence}`);
+          lines.push(`RRULE:${recurrenceRule}`);
         }
-      } else if (typeof event.recurrence === 'object') {
+      } else if (typeof recurrenceRule === 'object') {
         // Convert object to RRULE
-        lines.push(`RRULE:${this.objectToRRule(event.recurrence)}`);
+        lines.push(`RRULE:${this.objectToRRule(recurrenceRule)}`);
       }
     }
 
@@ -277,7 +278,8 @@ export class ICSParser {
       }
 
       case 'RRULE':
-        event.recurrence = value;
+        event.recurrenceRule = value;
+        event.recurring = true;
         break;
     }
   }
@@ -423,6 +425,8 @@ export class ICSParser {
       allDay: false,
       location: '',
       category: '',
+      recurring: false,
+      recurrenceRule: null,
       status: 'confirmed',
       showAs: 'busy',
       attendees: [],

package/core/integration/EnhancedCalendar.js

@@ -64,7 +64,7 @@ export class EnhancedCalendar extends Calendar {
     const recurringEvents = [];
 
     // Separate regular and recurring events
-    const allEvents = this.eventStore.getEventsInDateRange(startDate, endDate);
+    const allEvents = this.eventStore.getEventsInRange(startDate, endDate, false);
 
     for (const event of allEvents) {
       if (event.recurring) {
@@ -107,14 +107,11 @@ export class EnhancedCalendar extends Calendar {
     this.recurrenceEngine.addModifiedInstance(eventId, occurrenceDate, modifications);
 
     // Emit change event
-    this.emit('occurrence:modified', {
+    this._emit('occurrenceModified', {
       eventId,
       occurrenceDate,
       modifications
     });
-
-    // Trigger re-render if in view
-    this.refreshView();
   }
 
   /**
@@ -125,14 +122,11 @@ export class EnhancedCalendar extends Calendar {
     this.recurrenceEngine.addException(eventId, occurrenceDate, reason);
 
     // Emit change event
-    this.emit('occurrence:cancelled', {
+    this._emit('occurrenceCancelled', {
       eventId,
       occurrenceDate,
       reason
     });
-
-    // Trigger re-render
-    this.refreshView();
   }
 
   /**
@@ -153,13 +147,11 @@ export class EnhancedCalendar extends Calendar {
     }
 
     // Emit bulk change event
-    this.emit('occurrences:bulk-modified', {
+    this._emit('occurrencesBulkModified', {
       eventId,
       count: occurrences.length,
       modifications
     });
-
-    this.refreshView();
   }
 
   /**
@@ -211,28 +203,33 @@ export class EnhancedCalendar extends Calendar {
    * Setup real-time indexing for search
    */
   setupRealtimeIndexing() {
-    // Re-index when events are added
-    this.on('event:added', event => {
-      this.searchManager.indexEvents();
-    });
-
-    // Re-index when events are modified
-    this.on('event:updated', event => {
-      this.searchManager.indexEvents();
-    });
-
-    // Re-index when events are removed
-    this.on('event:removed', eventId => {
-      this.searchManager.indexEvents();
-    });
-
-    // Batch re-indexing for bulk operations
-    let reindexTimeout;
-    this.on('events:bulk-operation', () => {
-      clearTimeout(reindexTimeout);
+    // Batch re-indexing to avoid rebuilding the index repeatedly for rapid event changes.
+    let reindexTimeout = null;
+    const scheduleReindex = () => {
+      if (reindexTimeout) {
+        clearTimeout(reindexTimeout);
+      }
       reindexTimeout = setTimeout(() => {
         this.searchManager.indexEvents();
       }, 100);
+    };
+
+    // Store cleanup handle so timers are cleared on destroy.
+    this._clearReindexTimeout = () => {
+      if (reindexTimeout) {
+        clearTimeout(reindexTimeout);
+        reindexTimeout = null;
+      }
+    };
+
+    this.on('eventAdd', scheduleReindex);
+    this.on('eventUpdate', scheduleReindex);
+    this.on('eventRemove', scheduleReindex);
+    this.on('eventsSet', scheduleReindex);
+    this.on('eventStoreChange', change => {
+      if (change?.type === 'batch') {
+        scheduleReindex();
+      }
     });
   }
 
@@ -365,6 +362,11 @@ export class EnhancedCalendar extends Calendar {
    * Clean up resources
    */
   destroy() {
+    if (typeof this._clearReindexTimeout === 'function') {
+      this._clearReindexTimeout();
+      this._clearReindexTimeout = null;
+    }
+
     // Clean up worker
     if (this.searchManager) {
       this.searchManager.destroy();

package/core/search/EventSearch.js

@@ -152,7 +152,7 @@ export class EventSearch {
     // Recurring filter
     if (recurring !== null) {
       events = events.filter(event => {
-        const hasRecurrence = !!event.recurrence;
+        const hasRecurrence = !!(event.recurring || event.recurrenceRule || event.recurrence);
         return recurring ? hasRecurrence : !hasRecurrence;
       });
     }

package/package.json

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