@forcecalendar/core 2.1.0 → 2.1.2

package/core/calendar/Calendar.js

@@ -357,11 +357,7 @@ export class Calendar {
    * @returns {string} Formatted date string
    */
   formatInTimezone(date, timezone = null, options = {}) {
-    return this.timezoneManager.formatInTimezone(
-      date,
-      timezone || this.config.timeZone,
-      options
-    );
+    return this.timezoneManager.formatInTimezone(date, timezone || this.config.timeZone, options);
   }
 
   /**
@@ -437,7 +433,9 @@ export class Calendar {
     let currentDate = new Date(startDate);
 
     // Generate weeks
-    const maxWeeks = fixedWeekCount ? 6 : Math.ceil((lastDay.getDate() + DateUtils.getDayOfWeek(firstDay, weekStartsOn)) / 7);
+    const maxWeeks = fixedWeekCount
+      ? 6
+      : Math.ceil((lastDay.getDate() + DateUtils.getDayOfWeek(firstDay, weekStartsOn)) / 7);
 
     for (let weekIndex = 0; weekIndex < maxWeeks; weekIndex++) {
       const week = {
@@ -502,7 +500,7 @@ export class Calendar {
         events: this.getEventsForDate(dayDate),
         // Add overlap groups for positioning overlapping events
         overlapGroups: this.eventStore.getOverlapGroups(dayDate, true),
-        getEventPositions: (events) => this.eventStore.calculateEventPositions(events)
+        getEventPositions: events => this.eventStore.calculateEventPositions(events)
       });
       // Move to next day
       currentDate.setDate(currentDate.getDate() + 1);
@@ -706,7 +704,7 @@ export class Calendar {
     });
 
     // Listen to event store changes
-    this.eventStore.subscribe((change) => {
+    this.eventStore.subscribe(change => {
       this._emit('eventStoreChange', change);
     });
   }
@@ -752,4 +750,4 @@ export class Calendar {
 
     this._emit('destroy');
   }
-}// Test workflow
+} // Test workflow

package/core/calendar/DateUtils.js

@@ -209,9 +209,11 @@ export class DateUtils {
    * @returns {boolean}
    */
   static isSameDay(date1, date2) {
-    return date1.getFullYear() === date2.getFullYear() &&
-           date1.getMonth() === date2.getMonth() &&
-           date1.getDate() === date2.getDate();
+    return (
+      date1.getFullYear() === date2.getFullYear() &&
+      date1.getMonth() === date2.getMonth() &&
+      date1.getDate() === date2.getDate()
+    );
   }
 
   /**
@@ -234,8 +236,7 @@ export class DateUtils {
    * @returns {boolean}
    */
   static isSameMonth(date1, date2) {
-    return date1.getFullYear() === date2.getFullYear() &&
-           date1.getMonth() === date2.getMonth();
+    return date1.getFullYear() === date2.getFullYear() && date1.getMonth() === date2.getMonth();
   }
 
   /**
@@ -389,7 +390,7 @@ export class DateUtils {
    * @returns {boolean}
    */
   static isLeapYear(year) {
-    return (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0);
+    return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
   }
 
   /**
@@ -504,7 +505,7 @@ export class DateUtils {
     const originalOffset = DateUtils.getTimezoneOffset(date, timeZone);
 
     // Add hours
-    result.setTime(result.getTime() + (hours * 60 * 60 * 1000));
+    result.setTime(result.getTime() + hours * 60 * 60 * 1000);
 
     // Check if DST transition occurred
     const newOffset = DateUtils.getTimezoneOffset(result, timeZone);
@@ -550,8 +551,8 @@ export class DateUtils {
 
     // Get offset and adjust
     const offset = DateUtils.getTimezoneOffset(localDate, timeZone);
-    const utcTime = localDate.getTime() + (offset * 60000);
+    const utcTime = localDate.getTime() + offset * 60000;
 
     return new Date(utcTime);
   }
-}
+}

package/core/conflicts/ConflictDetector.js

@@ -47,7 +47,8 @@ export class ConflictDetector {
     const searchStart = new Date(event.start.getTime() - opts.bufferMinutes * 60000);
     const searchEnd = new Date(event.end.getTime() + opts.bufferMinutes * 60000);
 
-    const potentialConflicts = this.eventStore.getEventsInRange(searchStart, searchEnd, false)
+    const potentialConflicts = this.eventStore
+      .getEventsInRange(searchStart, searchEnd, false)
       .filter(e => {
         // Exclude self
         if (e.id === event.id) return false;
@@ -64,11 +65,7 @@ export class ConflictDetector {
 
     // Check each potential conflict
     for (const conflictingEvent of potentialConflicts) {
-      const eventConflicts = this._detectEventConflicts(
-        event,
-        conflictingEvent,
-        opts
-      );
+      const eventConflicts = this._detectEventConflicts(event, conflictingEvent, opts);
 
       if (eventConflicts.length > 0) {
         conflicts.push(...eventConflicts);
@@ -131,8 +128,8 @@ export class ConflictDetector {
       if (!opts.includeStatuses.includes(event.status)) return false;
       if (event.status === 'cancelled') return false;
 
-      return event.attendees && event.attendees.some(attendee =>
-        attendeeEmails.includes(attendee.email)
+      return (
+        event.attendees && event.attendees.some(attendee => attendeeEmails.includes(attendee.email))
       );
     });
 
@@ -173,9 +170,10 @@ export class ConflictDetector {
     const freePeriods = [];
 
     // Get busy periods
-    const busyPeriods = opts.attendeeEmails.length > 0
-      ? this.getBusyPeriods(opts.attendeeEmails, start, end)
-      : this._getAllBusyPeriods(start, end);
+    const busyPeriods =
+      opts.attendeeEmails.length > 0
+        ? this.getBusyPeriods(opts.attendeeEmails, start, end)
+        : this._getAllBusyPeriods(start, end);
 
     // Find gaps between busy periods
     let currentTime = new Date(start);
@@ -186,7 +184,10 @@ export class ConflictDetector {
         const gapDuration = (busy.start - currentTime) / 60000; // minutes
         if (gapDuration >= duration) {
           // Check if within business hours if required
-          if (!opts.businessHoursOnly || this._isWithinBusinessHours(currentTime, busy.start, opts)) {
+          if (
+            !opts.businessHoursOnly ||
+            this._isWithinBusinessHours(currentTime, busy.start, opts)
+          ) {
             freePeriods.push({
               start: new Date(currentTime),
               end: new Date(busy.start)
@@ -221,11 +222,7 @@ export class ConflictDetector {
     const conflicts = [];
 
     // Check time overlap with buffer
-    const hasTimeOverlap = this._checkTimeOverlap(
-      event1,
-      event2,
-      options.bufferMinutes
-    );
+    const hasTimeOverlap = this._checkTimeOverlap(event1, event2, options.bufferMinutes);
 
     if (hasTimeOverlap) {
       // Time conflict
@@ -490,14 +487,17 @@ export class ConflictDetector {
    * @private
    */
   _getAllBusyPeriods(start, end) {
-    const events = this.eventStore.getEventsInRange(start, end, false)
+    const events = this.eventStore
+      .getEventsInRange(start, end, false)
       .filter(e => e.status !== 'cancelled');
 
-    return events.map(event => ({
-      start: event.start,
-      end: event.end,
-      eventIds: [event.id]
-    })).sort((a, b) => a.start - b.start);
+    return events
+      .map(event => ({
+        start: event.start,
+        end: event.end,
+        eventIds: [event.id]
+      }))
+      .sort((a, b) => a.start - b.start);
   }
 
   /**
@@ -514,4 +514,4 @@ export class ConflictDetector {
 
     return startHour >= businessStart && endHour <= businessEnd;
   }
-}
+}

package/core/events/Event.js

@@ -179,12 +179,12 @@ export class Event {
     organizer = null,
     attendees = [],
     reminders = [],
-    category,  // Support singular category (no default)
-    categories,  // Support plural categories (no default)
+    category, // Support singular category (no default)
+    categories, // Support plural categories (no default)
     attachments = [],
     conferenceData = null,
     metadata = {},
-    ...rest  // Capture any extra properties
+    ...rest // Capture any extra properties
   }) {
     // Normalize and validate input
     const normalized = Event.normalize({
@@ -208,12 +208,12 @@ export class Event {
       organizer,
       attendees,
       reminders,
-      category,  // Pass category to normalize
-      categories,  // Pass categories to normalize
+      category, // Pass category to normalize
+      categories, // Pass categories to normalize
       attachments,
       conferenceData,
       metadata,
-      ...rest  // Pass any extra properties
+      ...rest // Pass any extra properties
     });
 
     // Validate normalized data
@@ -417,10 +417,9 @@ export class Event {
       dayEnd.setHours(23, 59, 59, 999);
 
       return this.start <= dayEnd && this.end >= dayStart;
-    } 
-      // Single day event: check if it's on the same day
-      return startString === dateString;
-    
+    }
+    // Single day event: check if it's on the same day
+    return startString === dateString;
   }
 
   /**
@@ -436,9 +435,8 @@ export class Event {
     } else if (otherEvent && otherEvent.start && otherEvent.end) {
       // Allow checking against time ranges
       return !(this.end <= otherEvent.start || this.start >= otherEvent.end);
-    } 
-      throw new Error('Parameter must be an Event instance or have start/end properties');
-    
+    }
+    throw new Error('Parameter must be an Event instance or have start/end properties');
   }
 
   /**
@@ -586,9 +584,7 @@ export class Event {
    * @returns {boolean} True if attendee was removed
    */
   removeAttendee(emailOrId) {
-    const index = this.attendees.findIndex(
-      a => a.email === emailOrId || a.id === emailOrId
-    );
+    const index = this.attendees.findIndex(a => a.email === emailOrId || a.id === emailOrId);
 
     if (index !== -1) {
       this.attendees.splice(index, 1);
@@ -747,9 +743,7 @@ export class Event {
    */
   removeCategory(category) {
     const normalizedCategory = category.trim().toLowerCase();
-    const index = this.categories.findIndex(
-      c => c.toLowerCase() === normalizedCategory
-    );
+    const index = this.categories.findIndex(c => c.toLowerCase() === normalizedCategory);
 
     if (index !== -1) {
       this.categories.splice(index, 1);
@@ -917,4 +911,4 @@ export class Event {
   get isVirtual() {
     return this.conferenceData !== null;
   }
-}
+}

package/core/events/EventStore.js

@@ -46,6 +46,8 @@ export class EventStore {
     this.isBatchMode = false;
     this.batchNotifications = [];
     this.batchBackup = null; // For rollback support
+    this._batchLock = null; // Lock to prevent concurrent batch operations
+    this._batchLockResolve = null; // Resolver for the batch lock
 
     // Change tracking
     /** @type {number} */
@@ -251,13 +253,15 @@ export class EventStore {
 
     // Filter by having attendees
     if (Object.prototype.hasOwnProperty.call(filters, 'hasAttendees')) {
-      results = results.filter(event => filters.hasAttendees ? event.hasAttendees : !event.hasAttendees);
+      results = results.filter(event =>
+        filters.hasAttendees ? event.hasAttendees : !event.hasAttendees
+      );
     }
 
     // Filter by organizer email
     if (filters.organizerEmail) {
-      results = results.filter(event =>
-        event.organizer && event.organizer.email === filters.organizerEmail
+      results = results.filter(
+        event => event.organizer && event.organizer.email === filters.organizerEmail
       );
     }
 
@@ -456,7 +460,7 @@ export class EventStore {
     events.sort((a, b) => {
       const startDiff = a.start - b.start;
       if (startDiff !== 0) return startDiff;
-      return (b.end - b.start) - (a.end - a.start);
+      return b.end - b.start - (a.end - a.start);
     });
 
     // Track which columns are occupied at each time
@@ -717,8 +721,10 @@ export class EventStore {
     // Index first week
     const firstWeekEnd = new Date(startDate);
     firstWeekEnd.setDate(firstWeekEnd.getDate() + 7);
-    const firstWeekDates = DateUtils.getDateRange(startDate,
-      firstWeekEnd < endDate ? firstWeekEnd : endDate);
+    const firstWeekDates = DateUtils.getDateRange(
+      startDate,
+      firstWeekEnd < endDate ? firstWeekEnd : endDate
+    );
 
     firstWeekDates.forEach(date => {
       const dateStr = DateUtils.getLocalDateString(date);
@@ -800,6 +806,22 @@ export class EventStore {
       }
     }
 
+    // Remove from category indices
+    for (const [category, eventIds] of this.indices.byCategory) {
+      eventIds.delete(event.id);
+      if (eventIds.size === 0) {
+        this.indices.byCategory.delete(category);
+      }
+    }
+
+    // Remove from status indices
+    for (const [status, eventIds] of this.indices.byStatus) {
+      eventIds.delete(event.id);
+      if (eventIds.size === 0) {
+        this.indices.byStatus.delete(status);
+      }
+    }
+
     // Remove from recurring index
     this.indices.recurring.delete(event.id);
   }
@@ -851,11 +873,19 @@ export class EventStore {
       this.batchBackup = {
         events: new Map(this.events),
         indices: {
-          byDate: new Map(Array.from(this.indices.byDate.entries()).map(([k, v]) => [k, new Set(v)])),
-          byMonth: new Map(Array.from(this.indices.byMonth.entries()).map(([k, v]) => [k, new Set(v)])),
+          byDate: new Map(
+            Array.from(this.indices.byDate.entries()).map(([k, v]) => [k, new Set(v)])
+          ),
+          byMonth: new Map(
+            Array.from(this.indices.byMonth.entries()).map(([k, v]) => [k, new Set(v)])
+          ),
           recurring: new Set(this.indices.recurring),
-          byCategory: new Map(Array.from(this.indices.byCategory.entries()).map(([k, v]) => [k, new Set(v)])),
-          byStatus: new Map(Array.from(this.indices.byStatus.entries()).map(([k, v]) => [k, new Set(v)]))
+          byCategory: new Map(
+            Array.from(this.indices.byCategory.entries()).map(([k, v]) => [k, new Set(v)])
+          ),
+          byStatus: new Map(
+            Array.from(this.indices.byStatus.entries()).map(([k, v]) => [k, new Set(v)])
+          )
         },
         version: this.version
       };
@@ -912,23 +942,44 @@ export class EventStore {
 
   /**
    * Execute batch operation with automatic rollback on error
+   * Uses a lock to prevent concurrent batch operations from corrupting state
    * @param {Function} operation - Operation to execute
    * @param {boolean} [enableRollback=true] - Enable automatic rollback on error
    * @returns {*} Result of operation
    * @throws {Error} If operation fails
    */
   async executeBatch(operation, enableRollback = true) {
-    this.startBatch(enableRollback);
+    // Wait for any existing batch operation to complete
+    while (this._batchLock) {
+      await this._batchLock;
+    }
+
+    // Acquire the lock
+    this._batchLock = new Promise(resolve => {
+      this._batchLockResolve = resolve;
+    });
 
     try {
-      const result = await operation();
-      this.commitBatch();
-      return result;
-    } catch (error) {
-      if (enableRollback) {
-        this.rollbackBatch();
+      this.startBatch(enableRollback);
+
+      try {
+        const result = await operation();
+        this.commitBatch();
+        return result;
+      } catch (error) {
+        if (enableRollback) {
+          this.rollbackBatch();
+        }
+        throw error;
+      }
+    } finally {
+      // Release the lock
+      const resolve = this._batchLockResolve;
+      this._batchLock = null;
+      this._batchLockResolve = null;
+      if (resolve) {
+        resolve();
       }
-      throw error;
     }
   }
 
@@ -1209,4 +1260,4 @@ export class EventStore {
 
     return eventsWithConflicts;
   }
-}
+}