@forcecalendar/core 2.1.12 → 2.1.14

package/core/events/Event.js

@@ -154,12 +154,20 @@ export class Event {
     // Validate timezone if provided
     if (data.timeZone) {
       try {
-        // Test if timezone is valid by trying to use it
         new Intl.DateTimeFormat('en-US', { timeZone: data.timeZone });
       } catch (e) {
         throw new Error(`Invalid timezone: ${data.timeZone}`);
       }
     }
+
+    // Validate end timezone if provided
+    if (data.endTimeZone) {
+      try {
+        new Intl.DateTimeFormat('en-US', { timeZone: data.endTimeZone });
+      } catch (e) {
+        throw new Error(`Invalid end timezone: ${data.endTimeZone}`);
+      }
+    }
   }
 
   /**

package/core/events/EventStore.js

@@ -415,33 +415,32 @@ export class EventStore {
       events = events.filter(e => !e.allDay);
     }
 
-    const groups = [];
-    const processed = new Set();
-
-    events.forEach(event => {
-      if (processed.has(event.id)) return;
-
-      // Start a new group with this event
-      const group = [event];
-      processed.add(event.id);
+    if (events.length === 0) return [];
 
-      // Find all events that overlap with any event in this group
-      let i = 0;
-      while (i < group.length) {
-        const currentEvent = group[i];
-
-        events.forEach(otherEvent => {
-          if (!processed.has(otherEvent.id) && currentEvent.overlaps(otherEvent)) {
-            group.push(otherEvent);
-            processed.add(otherEvent.id);
-          }
-        });
+    // Sweep-line approach: sort by start, then merge overlapping intervals
+    // O(n log n) instead of O(n²)
+    events.sort((a, b) => a.start - b.start || b.end - a.end);
 
-        i++;
+    const groups = [];
+    let currentGroup = [events[0]];
+    let groupEnd = events[0].end;
+
+    for (let i = 1; i < events.length; i++) {
+      const event = events[i];
+      if (event.start < groupEnd) {
+        // Overlaps with current group
+        currentGroup.push(event);
+        if (event.end > groupEnd) {
+          groupEnd = event.end;
+        }
+      } else {
+        // No overlap — start new group
+        groups.push(currentGroup);
+        currentGroup = [event];
+        groupEnd = event.end;
       }
-
-      groups.push(group);
-    });
+    }
+    groups.push(currentGroup);
 
     return groups;
   }
@@ -504,15 +503,24 @@ export class EventStore {
    * Get events for a date range
    * @param {Date} start - Start date
    * @param {Date} end - End date
-   * @param {boolean|string} expandRecurring - Whether to expand recurring events, or timezone string
-   * @param {string} [timezone] - Timezone for the query (if expandRecurring is boolean)
+   * @param {boolean|Object} [expandRecurringOrOptions=true] - Boolean to expand recurring events,
+   *   or options object: { expandRecurring?: boolean, timezone?: string }
+   * @param {string} [timezone] - Timezone for the query
    * @returns {Event[]}
    */
-  getEventsInRange(start, end, expandRecurring = true, timezone = null) {
-    // Handle overloaded parameters
-    if (typeof expandRecurring === 'string') {
-      timezone = expandRecurring;
+  getEventsInRange(start, end, expandRecurringOrOptions = true, timezone = null) {
+    let expandRecurring = true;
+
+    if (typeof expandRecurringOrOptions === 'object' && expandRecurringOrOptions !== null) {
+      // Options object form: getEventsInRange(start, end, { expandRecurring, timezone })
+      expandRecurring = expandRecurringOrOptions.expandRecurring !== false;
+      timezone = expandRecurringOrOptions.timezone || timezone;
+    } else if (typeof expandRecurringOrOptions === 'string') {
+      // Legacy overloaded form: string was treated as timezone (deprecated)
+      timezone = expandRecurringOrOptions;
       expandRecurring = true;
+    } else {
+      expandRecurring = expandRecurringOrOptions;
     }
 
     timezone = timezone || this.defaultTimezone;

package/core/events/RecurrenceEngine.js

@@ -165,6 +165,18 @@ export class RecurrenceEngine {
     const next = new Date(currentDate);
 
     switch (rule.freq) {
+      case 'SECONDLY':
+        next.setSeconds(next.getSeconds() + rule.interval);
+        break;
+
+      case 'MINUTELY':
+        next.setMinutes(next.getMinutes() + rule.interval);
+        break;
+
+      case 'HOURLY':
+        next.setHours(next.getHours() + rule.interval);
+        break;
+
       case 'DAILY':
         next.setDate(next.getDate() + rule.interval);
         break;

package/package.json

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