fix: appease the ci godas

jest.config.js

@@ -11,6 +11,7 @@ export default {
   },
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1',
+    '^color$': '<rootDir>/src/test/mocks/color.ts',
     '^webextension-polyfill$': '<rootDir>/src/test/mocks/webextension-polyfill.ts',
   },
   moduleFileExtensions: ['ts', 'js', 'json'],

src/plugins/built-in/timetable/CalendarSyncControl.svelte

@@ -520,7 +520,7 @@
         </div>
       </div>
 
-      <div class="bsplus-cal-provider bsplus-cal-provider--outlook" role="none">
+      <div class="bsplus-cal-provider" role="none">
         <div class="bsplus-cal-provider-row">
           <span class="bsplus-cal-provider-icon" aria-hidden="true">
             <OutlookCalendarIcon />
@@ -621,11 +621,6 @@
         {/if}
 
         <CalendarSyncProgress progress={syncProgress} />
-
-      <div class="bsplus-cal-coming-soon" role="none">
-        <span class="bsplus-cal-coming-soon-label">More providers</span>
-        <span class="bsplus-cal-coming-soon-hint">Apple Calendar — coming soon</span>
-      </div>
     </div>
   {/if}
 
@@ -851,10 +846,6 @@
     margin-bottom: 8px;
   }
 
-  .bsplus-cal-provider--outlook {
-    margin-bottom: 0;
-  }
-
   .bsplus-cal-provider-row {
     display: flex;
     align-items: center;
@@ -933,27 +924,6 @@
     background: color-mix(in srgb, var(--bsplus-cal-text) 14%, var(--bsplus-cal-surface));
   }
 
-  .bsplus-cal-coming-soon {
-    margin-top: 8px;
-    padding: 8px 10px;
-    border-radius: 8px;
-    border: 1px dashed var(--bsplus-cal-border, color-mix(in srgb, var(--bsplus-cal-text) 18%, transparent));
-  }
-
-  .bsplus-cal-coming-soon-label {
-    display: block;
-    font-size: 11px;
-    font-weight: 600;
-    color: color-mix(in srgb, var(--bsplus-cal-text, #111) 70%, transparent);
-  }
-
-  .bsplus-cal-coming-soon-hint {
-    display: block;
-    margin-top: 2px;
-    font-size: 10px;
-    color: color-mix(in srgb, var(--bsplus-cal-text, #111) 50%, transparent);
-  }
-
   .bsplus-cal-toast {
     position: fixed;
     right: 16px;

src/seqta/utils/calendarSync/lessonSyncShared.ts

@@ -0,0 +1,236 @@
+import { verboseLog } from "@/utils/verboseLog";
+import {
+  getStoredEventId,
+  lessonDateFromSeqtaKey,
+  normalizeEventMapEntry,
+} from "@/seqta/utils/googleCalendar/eventMapEntry";
+import {
+  isDateInRange,
+  syncWindowRange,
+} from "@/seqta/utils/googleCalendar/syncDateRange";
+import type {
+  GoogleCalendarSyncOptions,
+  GoogleCalendarSyncProgress,
+  GoogleCalendarSyncResult,
+} from "@/seqta/utils/googleCalendar/types";
+
+export const EVENT_MAP_PERSIST_EVERY = 10;
+
+export type EventMapRecord = Record<string, string | { id: string; date: string }>;
+
+export type MappedLessonEvent = {
+  seqtaKey: string;
+  startDateTime: string;
+};
+
+export function reportSyncProgress(
+  onProgress: GoogleCalendarSyncOptions["onProgress"],
+  progress: GoogleCalendarSyncProgress,
+) {
+  onProgress?.(progress);
+}
+
+export function lessonDateForEvent(startDateTime: string, seqtaKey: string): string {
+  return startDateTime.slice(0, 10) || lessonDateFromSeqtaKey(seqtaKey) || "";
+}
+
+export function originEventMapEntries(
+  eventMap: EventMapRecord,
+  origin: string,
+): Array<[string, string]> {
+  const prefix = `${origin}::`;
+  const entries: Array<[string, string]> = [];
+  for (const [key, value] of Object.entries(eventMap)) {
+    if (!key.startsWith(prefix)) continue;
+    const id = getStoredEventId(value);
+    if (id) entries.push([key, id]);
+  }
+  return entries;
+}
+
+function shouldPruneEntry(
+  mode: "full" | "incremental",
+  entry: { id: string; date: string },
+  mapKey: string,
+  window: ReturnType<typeof syncWindowRange>,
+  currentMapKeys: Set<string>,
+): boolean {
+  if (mode === "incremental") return false;
+  if (entry.date) return !isDateInRange(entry.date, window);
+  return !currentMapKeys.has(mapKey);
+}
+
+export function entriesToPrune(
+  eventMap: EventMapRecord,
+  origin: string,
+  mode: "full" | "incremental",
+  weeksAhead: number,
+  currentMapKeys: Set<string>,
+): Array<[string, string]> {
+  const window = syncWindowRange(weeksAhead);
+  const prefix = `${origin}::`;
+  const entries: Array<[string, string]> = [];
+
+  for (const [mapKey, raw] of Object.entries(eventMap)) {
+    if (!mapKey.startsWith(prefix)) continue;
+    const entry = normalizeEventMapEntry(raw);
+    if (!entry) continue;
+    if (shouldPruneEntry(mode, entry, mapKey, window, currentMapKeys)) {
+      entries.push([mapKey, entry.id]);
+    }
+  }
+
+  return entries;
+}
+
+export function notConfiguredSyncResult(error: string): GoogleCalendarSyncResult {
+  return { success: false, configured: false, error };
+}
+
+export function notConnectedSyncResult(error: string): GoogleCalendarSyncResult {
+  return { success: false, configured: true, connected: false, error };
+}
+
+export function emptyLessonsSyncResult(): GoogleCalendarSyncResult {
+  return {
+    success: false,
+    configured: true,
+    connected: true,
+    error: "No timetable classes found to sync for the selected range.",
+  };
+}
+
+export function buildLessonSyncResult(
+  created: number,
+  updated: number,
+  deleted: number,
+  failed: number,
+  lastSyncAt: number,
+): GoogleCalendarSyncResult {
+  return {
+    success: failed === 0,
+    configured: true,
+    connected: true,
+    created,
+    updated,
+    deleted,
+    skipped: 0,
+    failed,
+    lastSyncAt,
+    error:
+      failed > 0
+        ? `Synced with ${failed} error${failed === 1 ? "" : "s"}. Check the console for details.`
+        : undefined,
+  };
+}
+
+export async function persistFinalSyncState(
+  writeState: (patch: {
+    eventMap: EventMapRecord;
+    lastSyncAt: number;
+    lastSyncOrigin: string;
+  }) => Promise<unknown>,
+  eventMap: EventMapRecord,
+  lastSyncAt: number,
+  origin: string,
+  staleDeleted: number,
+  staleEntryCount: number,
+  eventCount: number,
+): Promise<void> {
+  if (staleDeleted > 0 || staleEntryCount > 0 || eventCount > 0) {
+    await writeState({ eventMap, lastSyncAt, lastSyncOrigin: origin });
+  }
+}
+
+type UpsertLessonEventsParams<TEvent extends MappedLessonEvent> = {
+  events: TEvent[];
+  eventMap: EventMapRecord;
+  origin: string;
+  staleEntryCount: number;
+  totalSteps: number;
+  lastSyncAt: number;
+  initialFailed: number;
+  getAccessToken: () => Promise<string>;
+  mapKey: (origin: string, seqtaKey: string) => string;
+  upsert: (
+    accessToken: string,
+    existingId: string | undefined,
+    event: TEvent,
+    refreshAccessToken: () => Promise<string>,
+  ) => Promise<string>;
+  writeState: (patch: {
+    eventMap: EventMapRecord;
+    lastSyncAt: number;
+    lastSyncOrigin: string;
+  }) => Promise<unknown>;
+  onProgress?: GoogleCalendarSyncOptions["onProgress"];
+  logLabel: string;
+};
+
+export async function upsertLessonEvents<TEvent extends MappedLessonEvent>(
+  params: UpsertLessonEventsParams<TEvent>,
+): Promise<{ created: number; updated: number; failed: number; accessToken: string }> {
+  const {
+    events,
+    eventMap,
+    origin,
+    staleEntryCount,
+    totalSteps,
+    lastSyncAt,
+    initialFailed,
+    getAccessToken,
+    mapKey,
+    upsert,
+    writeState,
+    onProgress,
+    logLabel,
+  } = params;
+
+  let accessToken = await getAccessToken();
+  let created = 0;
+  let updated = 0;
+  let failed = initialFailed;
+
+  for (let i = 0; i < events.length; i++) {
+    const event = events[i];
+    const key = mapKey(origin, event.seqtaKey);
+    const existingId = getStoredEventId(eventMap[key]);
+    const progressCurrent = staleEntryCount + i + 1;
+    const progressMessage = `Syncing events (${i + 1}/${events.length})…`;
+
+    try {
+      const remoteId = await upsert(accessToken, existingId, event, async () => {
+        accessToken = await getAccessToken();
+        return accessToken;
+      });
+      if (existingId) updated += 1;
+      else created += 1;
+      eventMap[key] = {
+        id: remoteId,
+        date: lessonDateForEvent(event.startDateTime, event.seqtaKey),
+      };
+
+      reportSyncProgress(onProgress, {
+        phase: "upserting",
+        current: progressCurrent,
+        total: totalSteps,
+        message: progressMessage,
+      });
+
+      if ((i + 1) % EVENT_MAP_PERSIST_EVERY === 0 || i === events.length - 1) {
+        await writeState({ eventMap, lastSyncAt, lastSyncOrigin: origin });
+      }
+    } catch (err) {
+      verboseLog(`[BetterSEQTA+] ${logLabel} event sync failed:`, err);
+      failed += 1;
+      reportSyncProgress(onProgress, {
+        phase: "upserting",
+        current: progressCurrent,
+        total: totalSteps,
+        message: progressMessage,
+      });
+    }
+  }
+
+  return { created, updated, failed, accessToken };
+}

src/seqta/utils/calendarSync/weeklySyncMessages.ts

@@ -0,0 +1,51 @@
+import type { GoogleCalendarSyncResult } from "@/seqta/utils/googleCalendar/types";
+import { formatSyncResultMessage } from "@/seqta/utils/googleCalendar/syncRunner";
+import { formatOutlookSyncResultMessage } from "@/seqta/utils/outlookCalendar/syncRunner";
+
+type ProviderCalendarState = {
+  refreshToken?: string;
+  accessToken?: string;
+};
+
+function isProviderConnected(state: ProviderCalendarState): boolean {
+  return Boolean(state.refreshToken || state.accessToken);
+}
+
+function providerHadChanges(result: GoogleCalendarSyncResult): boolean {
+  return (
+    (result.created ?? 0) + (result.updated ?? 0) + (result.deleted ?? 0) > 0
+  );
+}
+
+export function weeklySyncErrorMessage(
+  results: GoogleCalendarSyncResult[],
+): string | undefined {
+  const failed = results.find((result) => !result.success);
+  if (!failed) return undefined;
+  return failed.error ?? "Weekly calendar sync failed.";
+}
+
+export function formatWeeklySyncMessages(
+  google: ProviderCalendarState,
+  outlook: ProviderCalendarState,
+  results: GoogleCalendarSyncResult[],
+): string[] {
+  const messages: string[] = [];
+  let index = 0;
+
+  if (isProviderConnected(google)) {
+    const result = results[index++];
+    if (result && providerHadChanges(result)) {
+      messages.push(formatSyncResultMessage(result));
+    }
+  }
+
+  if (isProviderConnected(outlook)) {
+    const result = results[index++];
+    if (result && providerHadChanges(result)) {
+      messages.push(formatOutlookSyncResultMessage(result));
+    }
+  }
+
+  return messages;
+}

src/seqta/utils/googleCalendar/calendarSyncListener.ts

@@ -4,13 +4,11 @@ import {
   shouldRunWeeklySync,
 } from "@/seqta/utils/calendarSync/settings";
 import {
-  formatSyncResultMessage,
+  formatWeeklySyncMessages,
-  runGoogleCalendarSync,
+  weeklySyncErrorMessage,
-} from "@/seqta/utils/googleCalendar/syncRunner";
+} from "@/seqta/utils/calendarSync/weeklySyncMessages";
-import {
+import { runGoogleCalendarSync } from "@/seqta/utils/googleCalendar/syncRunner";
-  formatOutlookSyncResultMessage,
+import { runOutlookCalendarSync } from "@/seqta/utils/outlookCalendar/syncRunner";
-  runOutlookCalendarSync,
-} from "@/seqta/utils/outlookCalendar/syncRunner";
 import { readGoogleCalendarState } from "@/seqta/utils/googleCalendar/storage";
 import { readOutlookCalendarState } from "@/seqta/utils/outlookCalendar/storage";
 import type { GoogleCalendarSyncResult } from "@/seqta/utils/googleCalendar/types";
@@ -70,27 +68,13 @@ export async function maybeRunDueWeeklySync(
   const results = await runWeeklySyncForConnectedProviders();
   if (!onComplete) return;
 
-  const errors = results.filter((r) => !r.success);
+  const errorMessage = weeklySyncErrorMessage(results);
-  if (errors.length > 0) {
+  if (errorMessage) {
-    onComplete(errors[0]?.error ?? "Weekly calendar sync failed.", true);
+    onComplete(errorMessage, true);
     return;
   }
 
-  const messages: string[] = [];
+  const messages = formatWeeklySyncMessages(google, outlook, results);
-  let index = 0;
-  if (google.refreshToken || google.accessToken) {
-    const result = results[index++];
-    const changed =
-      (result.created ?? 0) + (result.updated ?? 0) + (result.deleted ?? 0) > 0;
-    if (changed) messages.push(formatSyncResultMessage(result));
-  }
-  if (outlook.refreshToken || outlook.accessToken) {
-    const result = results[index++];
-    const changed =
-      (result.created ?? 0) + (result.updated ?? 0) + (result.deleted ?? 0) > 0;
-    if (changed) messages.push(formatOutlookSyncResultMessage(result));
-  }
-
   if (messages.length > 0) {
     onComplete(messages.join(" "));
   }

src/seqta/utils/googleCalendar/syncEngine.ts

@@ -1,16 +1,19 @@
 import { verboseLog } from "@/utils/verboseLog";
 import { isGoogleCalendarConfigured } from "@/config/googleCalendar";
 import { googleApiEventBody, mapLessonsToGoogleEvents } from "@/seqta/utils/googleCalendar/eventMapper";
-import {
-  getStoredEventId,
-  lessonDateFromSeqtaKey,
-  normalizeEventMapEntry,
-} from "@/seqta/utils/googleCalendar/eventMapEntry";
-import {
-  isDateInRange,
-  syncWindowRange,
-} from "@/seqta/utils/googleCalendar/syncDateRange";
 import { getSyncWeeksAhead } from "@/seqta/utils/calendarSync/settings";
+import {
+  buildLessonSyncResult,
+  emptyLessonsSyncResult,
+  entriesToPrune,
+  EVENT_MAP_PERSIST_EVERY,
+  notConfiguredSyncResult,
+  notConnectedSyncResult,
+  originEventMapEntries,
+  persistFinalSyncState,
+  reportSyncProgress,
+  upsertLessonEvents,
+} from "@/seqta/utils/calendarSync/lessonSyncShared";
 import {
   eventMapKey,
   readGoogleCalendarState,
@@ -19,7 +22,6 @@ import {
 import type {
   GoogleCalendarDeleteResult,
   GoogleCalendarSyncOptions,
-  GoogleCalendarSyncProgress,
   GoogleCalendarSyncRequest,
   GoogleCalendarSyncResult,
 } from "@/seqta/utils/googleCalendar/types";
@@ -28,7 +30,6 @@ import {
   upsertGoogleCalendarEvent,
 } from "@/seqta/utils/googleCalendar/upsertEvent";
 
-const EVENT_MAP_PERSIST_EVERY = 10;
 const CALENDAR_ID = "primary";
 
 type DeleteTrackedEventsResult = {
@@ -36,17 +37,6 @@ type DeleteTrackedEventsResult = {
   failed: number;
 };
 
-function reportProgress(
-  onProgress: GoogleCalendarSyncOptions["onProgress"],
-  progress: GoogleCalendarSyncProgress,
-) {
-  onProgress?.(progress);
-}
-
-function lessonDateForEvent(startDateTime: string, seqtaKey: string): string {
-  return startDateTime.slice(0, 10) || lessonDateFromSeqtaKey(seqtaKey) || "";
-}
-
 async function deleteTrackedEventsFromGoogle(
   entries: Array<[string, string]>,
   eventMap: Record<string, string | { id: string; date: string }>,
@@ -72,7 +62,7 @@ async function deleteTrackedEventsFromGoogle(
       delete eventMap[mapKey];
       deleted += 1;
 
-      reportProgress(onProgress, {
+      reportSyncProgress(onProgress, {
         phase: "deleting",
         current: progressOffset + deleted + failed,
         total: progressTotal,
@@ -85,7 +75,7 @@ async function deleteTrackedEventsFromGoogle(
     } catch (err) {
       verboseLog("[BetterSEQTA+] Google Calendar event delete failed:", err);
       failed += 1;
-      reportProgress(onProgress, {
+      reportSyncProgress(onProgress, {
         phase: "deleting",
         current: progressOffset + deleted + failed,
         total: progressTotal,
@@ -97,51 +87,6 @@ async function deleteTrackedEventsFromGoogle(
   return { deleted, failed };
 }
 
-function originEventMapEntries(
-  eventMap: Record<string, string | { id: string; date: string }>,
-  origin: string,
-): Array<[string, string]> {
-  const prefix = `${origin}::`;
-  const entries: Array<[string, string]> = [];
-  for (const [key, value] of Object.entries(eventMap)) {
-    if (!key.startsWith(prefix)) continue;
-    const id = getStoredEventId(value);
-    if (id) entries.push([key, id]);
-  }
-  return entries;
-}
-
-function entriesToPrune(
-  eventMap: Record<string, string | { id: string; date: string }>,
-  origin: string,
-  mode: "full" | "incremental",
-  weeksAhead: number,
-  currentMapKeys: Set<string>,
-): Array<[string, string]> {
-  const window = syncWindowRange(weeksAhead);
-  const prefix = `${origin}::`;
-  const entries: Array<[string, string]> = [];
-
-  for (const [mapKey, raw] of Object.entries(eventMap)) {
-    if (!mapKey.startsWith(prefix)) continue;
-    const entry = normalizeEventMapEntry(raw);
-    if (!entry) continue;
-
-    let shouldDelete = false;
-    if (mode === "incremental") {
-      shouldDelete = false;
-    } else if (entry.date) {
-      shouldDelete = !isDateInRange(entry.date, window);
-    } else {
-      shouldDelete = !currentMapKeys.has(mapKey);
-    }
-
-    if (shouldDelete) entries.push([mapKey, entry.id]);
-  }
-
-  return entries;
-}
-
 /** Runs in the content script tab so long syncs are not killed by the MV3 service worker. */
 export async function syncLessonsToGoogleCalendar(
   request: GoogleCalendarSyncRequest,
@@ -149,16 +94,14 @@ export async function syncLessonsToGoogleCalendar(
   options: GoogleCalendarSyncOptions = {},
 ): Promise<GoogleCalendarSyncResult> {
   if (!isGoogleCalendarConfigured()) {
-    return {
+    return notConfiguredSyncResult(
-      success: false,
+      "Google Calendar is not configured in this extension build.",
-      configured: false,
+    );
-      error: "Google Calendar is not configured in this extension build.",
-    };
   }
 
   const state = await readGoogleCalendarState();
   if (!state.refreshToken && !state.accessToken) {
-    return { success: false, configured: true, connected: false, error: "Connect Google Calendar first." };
+    return notConnectedSyncResult("Connect Google Calendar first.");
   }
 
   const mode = request.mode ?? "full";
@@ -167,26 +110,21 @@ export async function syncLessonsToGoogleCalendar(
   const events = mapLessonsToGoogleEvents(request.origin, request.lessons, timeZone);
 
   if (events.length === 0 && mode === "full") {
-    return {
+    return emptyLessonsSyncResult();
-      success: false,
-      configured: true,
-      connected: true,
-      error: "No timetable classes found to sync for the selected range.",
-    };
   }
 
-  reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
     phase: "preparing",
     current: 0,
     total: Math.max(events.length, 1),
     message: mode === "incremental" ? "Preparing weekly sync…" : "Preparing sync…",
   });
 
-  let accessToken = await getAccessToken();
   const eventMap = { ...(state.eventMap ?? {}) };
   const currentMapKeys = new Set(events.map((event) => eventMapKey(request.origin, event.seqtaKey)));
   const staleEntries = entriesToPrune(eventMap, request.origin, mode, weeksAhead, currentMapKeys);
   const totalSteps = staleEntries.length + events.length;
+  const lastSyncAt = Date.now();
 
   const staleResult = await deleteTrackedEventsFromGoogle(
     staleEntries,
@@ -198,89 +136,53 @@ export async function syncLessonsToGoogleCalendar(
     totalSteps,
   );
 
-  let created = 0;
+  const upsertResult = await upsertLessonEvents({
-  let updated = 0;
+    events,
-  let failed = staleResult.failed;
+    eventMap,
-  const lastSyncAt = Date.now();
+    origin: request.origin,
-
+    staleEntryCount: staleEntries.length,
-  for (let i = 0; i < events.length; i++) {
+    totalSteps,
-    const event = events[i];
+    lastSyncAt,
-    const mapKey = eventMapKey(request.origin, event.seqtaKey);
+    initialFailed: staleResult.failed,
-    const existingId = getStoredEventId(eventMap[mapKey]);
+    getAccessToken,
-    try {
+    mapKey: eventMapKey,
-      const googleId = await upsertGoogleCalendarEvent(
+    upsert: (accessToken, existingId, event, refreshAccessToken) =>
+      upsertGoogleCalendarEvent(
         accessToken,
         CALENDAR_ID,
         existingId,
         googleApiEventBody(event),
-        async () => {
+        refreshAccessToken,
-          accessToken = await getAccessToken();
+      ),
-          return accessToken;
+    writeState: writeGoogleCalendarState,
-        },
+    onProgress: options.onProgress,
+    logLabel: "Google Calendar",
+  });
+
+  await persistFinalSyncState(
+    writeGoogleCalendarState,
+    eventMap,
+    lastSyncAt,
+    request.origin,
+    staleResult.deleted,
+    staleEntries.length,
+    events.length,
   );
-      if (existingId) updated += 1;
-      else created += 1;
-      eventMap[mapKey] = {
-        id: googleId,
-        date: lessonDateForEvent(event.startDateTime, event.seqtaKey),
-      };
 
-      reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
-        phase: "upserting",
-        current: staleEntries.length + i + 1,
-        total: totalSteps,
-        message: `Syncing events (${i + 1}/${events.length})…`,
-      });
-
-      if ((i + 1) % EVENT_MAP_PERSIST_EVERY === 0 || i === events.length - 1) {
-        await writeGoogleCalendarState({
-          eventMap,
-          lastSyncAt,
-          lastSyncOrigin: request.origin,
-        });
-      }
-    } catch (err) {
-      verboseLog("[BetterSEQTA+] Google Calendar event sync failed:", err);
-      failed += 1;
-      reportProgress(options.onProgress, {
-        phase: "upserting",
-        current: staleEntries.length + i + 1,
-        total: totalSteps,
-        message: `Syncing events (${i + 1}/${events.length})…`,
-      });
-    }
-  }
-
-  if (staleResult.deleted > 0 || staleEntries.length > 0 || events.length > 0) {
-    await writeGoogleCalendarState({
-      eventMap,
-      lastSyncAt,
-      lastSyncOrigin: request.origin,
-    });
-  }
-
-  reportProgress(options.onProgress, {
     phase: "done",
     current: totalSteps,
     total: totalSteps,
     message: "Sync complete",
   });
 
-  return {
+  return buildLessonSyncResult(
-    success: failed === 0,
+    upsertResult.created,
-    configured: true,
+    upsertResult.updated,
-    connected: true,
+    staleResult.deleted,
-    created,
+    upsertResult.failed,
-    updated,
-    deleted: staleResult.deleted,
-    skipped: 0,
-    failed,
     lastSyncAt,
-    error:
+  );
-      failed > 0
-        ? `Synced with ${failed} error${failed === 1 ? "" : "s"}. Check the console for details.`
-        : undefined,
-  };
 }
 
 /** Delete all tracked BetterSEQTA+ events for this SEQTA origin from Google Calendar. */
@@ -307,7 +209,7 @@ export async function deleteSyncedEventsFromGoogleCalendar(
     return { success: true, configured: true, connected: true, deleted: 0, failed: 0 };
   }
 
-  reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
     phase: "preparing",
     current: 0,
     total: entries.length,
@@ -327,7 +229,7 @@ export async function deleteSyncedEventsFromGoogleCalendar(
 
   await writeGoogleCalendarState({ eventMap });
 
-  reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
     phase: "done",
     current: entries.length,
     total: entries.length,

src/seqta/utils/outlookCalendar/syncEngine.ts

@@ -2,18 +2,20 @@ import { verboseLog } from "@/utils/verboseLog";
 import { isOutlookCalendarConfigured } from "@/config/outlookCalendar";
 import { getSyncWeeksAhead } from "@/seqta/utils/calendarSync/settings";
 import {
-  getStoredEventId,
+  buildLessonSyncResult,
-  lessonDateFromSeqtaKey,
+  emptyLessonsSyncResult,
-  normalizeEventMapEntry,
+  entriesToPrune,
-} from "@/seqta/utils/googleCalendar/eventMapEntry";
+  EVENT_MAP_PERSIST_EVERY,
-import {
+  notConfiguredSyncResult,
-  isDateInRange,
+  notConnectedSyncResult,
-  syncWindowRange,
+  originEventMapEntries,
-} from "@/seqta/utils/googleCalendar/syncDateRange";
+  persistFinalSyncState,
+  reportSyncProgress,
+  upsertLessonEvents,
+} from "@/seqta/utils/calendarSync/lessonSyncShared";
 import type {
   GoogleCalendarDeleteResult,
   GoogleCalendarSyncOptions,
-  GoogleCalendarSyncProgress,
   GoogleCalendarSyncRequest,
   GoogleCalendarSyncResult,
 } from "@/seqta/utils/googleCalendar/types";
@@ -31,24 +33,11 @@ import {
   upsertOutlookCalendarEvent,
 } from "@/seqta/utils/outlookCalendar/upsertEvent";
 
-const EVENT_MAP_PERSIST_EVERY = 10;
-
 type DeleteTrackedEventsResult = {
   deleted: number;
   failed: number;
 };
 
-function reportProgress(
-  onProgress: GoogleCalendarSyncOptions["onProgress"],
-  progress: GoogleCalendarSyncProgress,
-) {
-  onProgress?.(progress);
-}
-
-function lessonDateForEvent(startDateTime: string, seqtaKey: string): string {
-  return startDateTime.slice(0, 10) || lessonDateFromSeqtaKey(seqtaKey) || "";
-}
-
 async function deleteTrackedEventsFromOutlook(
   entries: Array<[string, string]>,
   eventMap: Record<string, string | { id: string; date: string }>,
@@ -73,7 +62,7 @@ async function deleteTrackedEventsFromOutlook(
       delete eventMap[mapKey];
       deleted += 1;
 
-      reportProgress(onProgress, {
+      reportSyncProgress(onProgress, {
         phase: "deleting",
         current: progressOffset + deleted + failed,
         total: progressTotal,
@@ -86,7 +75,7 @@ async function deleteTrackedEventsFromOutlook(
     } catch (err) {
       verboseLog("[BetterSEQTA+] Outlook Calendar event delete failed:", err);
       failed += 1;
-      reportProgress(onProgress, {
+      reportSyncProgress(onProgress, {
         phase: "deleting",
         current: progressOffset + deleted + failed,
         total: progressTotal,
@@ -98,67 +87,20 @@ async function deleteTrackedEventsFromOutlook(
   return { deleted, failed };
 }
 
-function originEventMapEntries(
-  eventMap: Record<string, string | { id: string; date: string }>,
-  origin: string,
-): Array<[string, string]> {
-  const prefix = `${origin}::`;
-  const entries: Array<[string, string]> = [];
-  for (const [key, value] of Object.entries(eventMap)) {
-    if (!key.startsWith(prefix)) continue;
-    const id = getStoredEventId(value);
-    if (id) entries.push([key, id]);
-  }
-  return entries;
-}
-
-function entriesToPrune(
-  eventMap: Record<string, string | { id: string; date: string }>,
-  origin: string,
-  mode: "full" | "incremental",
-  weeksAhead: number,
-  currentMapKeys: Set<string>,
-): Array<[string, string]> {
-  const window = syncWindowRange(weeksAhead);
-  const prefix = `${origin}::`;
-  const entries: Array<[string, string]> = [];
-
-  for (const [mapKey, raw] of Object.entries(eventMap)) {
-    if (!mapKey.startsWith(prefix)) continue;
-    const entry = normalizeEventMapEntry(raw);
-    if (!entry) continue;
-
-    let shouldDelete = false;
-    if (mode === "incremental") {
-      shouldDelete = false;
-    } else if (entry.date) {
-      shouldDelete = !isDateInRange(entry.date, window);
-    } else {
-      shouldDelete = !currentMapKeys.has(mapKey);
-    }
-
-    if (shouldDelete) entries.push([mapKey, entry.id]);
-  }
-
-  return entries;
-}
-
 export async function syncLessonsToOutlookCalendar(
   request: GoogleCalendarSyncRequest,
   getAccessToken: () => Promise<string>,
   options: GoogleCalendarSyncOptions = {},
 ): Promise<GoogleCalendarSyncResult> {
   if (!isOutlookCalendarConfigured()) {
-    return {
+    return notConfiguredSyncResult(
-      success: false,
+      "Outlook Calendar is not configured in this extension build.",
-      configured: false,
+    );
-      error: "Outlook Calendar is not configured in this extension build.",
-    };
   }
 
   const state = await readOutlookCalendarState();
   if (!state.refreshToken && !state.accessToken) {
-    return { success: false, configured: true, connected: false, error: "Connect Outlook Calendar first." };
+    return notConnectedSyncResult("Connect Outlook Calendar first.");
   }
 
   const mode = request.mode ?? "full";
@@ -167,28 +109,23 @@ export async function syncLessonsToOutlookCalendar(
   const events = mapLessonsToOutlookEvents(request.origin, request.lessons, timeZone);
 
   if (events.length === 0 && mode === "full") {
-    return {
+    return emptyLessonsSyncResult();
-      success: false,
-      configured: true,
-      connected: true,
-      error: "No timetable classes found to sync for the selected range.",
-    };
   }
 
-  reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
     phase: "preparing",
     current: 0,
     total: Math.max(events.length, 1),
     message: mode === "incremental" ? "Preparing weekly sync…" : "Preparing sync…",
   });
 
-  let accessToken = await getAccessToken();
   const eventMap = { ...(state.eventMap ?? {}) };
   const currentMapKeys = new Set(
     events.map((event) => outlookEventMapKey(request.origin, event.seqtaKey)),
   );
   const staleEntries = entriesToPrune(eventMap, request.origin, mode, weeksAhead, currentMapKeys);
   const totalSteps = staleEntries.length + events.length;
+  const lastSyncAt = Date.now();
 
   const staleResult = await deleteTrackedEventsFromOutlook(
     staleEntries,
@@ -200,88 +137,52 @@ export async function syncLessonsToOutlookCalendar(
     totalSteps,
   );
 
-  let created = 0;
+  const upsertResult = await upsertLessonEvents({
-  let updated = 0;
+    events,
-  let failed = staleResult.failed;
+    eventMap,
-  const lastSyncAt = Date.now();
+    origin: request.origin,
-
+    staleEntryCount: staleEntries.length,
-  for (let i = 0; i < events.length; i++) {
+    totalSteps,
-    const event = events[i];
+    lastSyncAt,
-    const mapKey = outlookEventMapKey(request.origin, event.seqtaKey);
+    initialFailed: staleResult.failed,
-    const existingId = getStoredEventId(eventMap[mapKey]);
+    getAccessToken,
-    try {
+    mapKey: outlookEventMapKey,
-      const outlookId = await upsertOutlookCalendarEvent(
+    upsert: (accessToken, existingId, event, refreshAccessToken) =>
+      upsertOutlookCalendarEvent(
         accessToken,
         existingId,
         outlookGraphEventBody(event),
-        async () => {
+        refreshAccessToken,
-          accessToken = await getAccessToken();
+      ),
-          return accessToken;
+    writeState: writeOutlookCalendarState,
-        },
+    onProgress: options.onProgress,
+    logLabel: "Outlook Calendar",
+  });
+
+  await persistFinalSyncState(
+    writeOutlookCalendarState,
+    eventMap,
+    lastSyncAt,
+    request.origin,
+    staleResult.deleted,
+    staleEntries.length,
+    events.length,
   );
-      if (existingId) updated += 1;
-      else created += 1;
-      eventMap[mapKey] = {
-        id: outlookId,
-        date: lessonDateForEvent(event.startDateTime, event.seqtaKey),
-      };
 
-      reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
-        phase: "upserting",
-        current: staleEntries.length + i + 1,
-        total: totalSteps,
-        message: `Syncing events (${i + 1}/${events.length})…`,
-      });
-
-      if ((i + 1) % EVENT_MAP_PERSIST_EVERY === 0 || i === events.length - 1) {
-        await writeOutlookCalendarState({
-          eventMap,
-          lastSyncAt,
-          lastSyncOrigin: request.origin,
-        });
-      }
-    } catch (err) {
-      verboseLog("[BetterSEQTA+] Outlook Calendar event sync failed:", err);
-      failed += 1;
-      reportProgress(options.onProgress, {
-        phase: "upserting",
-        current: staleEntries.length + i + 1,
-        total: totalSteps,
-        message: `Syncing events (${i + 1}/${events.length})…`,
-      });
-    }
-  }
-
-  if (staleResult.deleted > 0 || staleEntries.length > 0 || events.length > 0) {
-    await writeOutlookCalendarState({
-      eventMap,
-      lastSyncAt,
-      lastSyncOrigin: request.origin,
-    });
-  }
-
-  reportProgress(options.onProgress, {
     phase: "done",
     current: totalSteps,
     total: totalSteps,
     message: "Sync complete",
   });
 
-  return {
+  return buildLessonSyncResult(
-    success: failed === 0,
+    upsertResult.created,
-    configured: true,
+    upsertResult.updated,
-    connected: true,
+    staleResult.deleted,
-    created,
+    upsertResult.failed,
-    updated,
-    deleted: staleResult.deleted,
-    skipped: 0,
-    failed,
     lastSyncAt,
-    error:
+  );
-      failed > 0
-        ? `Synced with ${failed} error${failed === 1 ? "" : "s"}. Check the console for details.`
-        : undefined,
-  };
 }
 
 export async function deleteSyncedEventsFromOutlookCalendar(
@@ -307,7 +208,7 @@ export async function deleteSyncedEventsFromOutlookCalendar(
     return { success: true, configured: true, connected: true, deleted: 0, failed: 0 };
   }
 
-  reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
     phase: "preparing",
     current: 0,
     total: entries.length,
@@ -327,7 +228,7 @@ export async function deleteSyncedEventsFromOutlookCalendar(
 
   await writeOutlookCalendarState({ eventMap });
 
-  reportProgress(options.onProgress, {
+  reportSyncProgress(options.onProgress, {
     phase: "done",
     current: entries.length,
     total: entries.length,

src/test/mocks/color.ts

@@ -0,0 +1,86 @@
+type ColorChannels = {
+  r: number;
+  g: number;
+  b: number;
+  a: number;
+};
+
+function clampByte(value: number): number {
+  return Math.max(0, Math.min(255, Math.round(value)));
+}
+
+function clampAlpha(value: number): number {
+  return Math.max(0, Math.min(1, value));
+}
+
+function toHexByte(value: number): string {
+  return clampByte(value).toString(16).padStart(2, "0");
+}
+
+function createColor(channels: ColorChannels) {
+  const color = {
+    red: () => clampByte(channels.r),
+    green: () => clampByte(channels.g),
+    blue: () => clampByte(channels.b),
+    alpha: () => clampAlpha(channels.a),
+    hex: () =>
+      `#${toHexByte(channels.r)}${toHexByte(channels.g)}${toHexByte(channels.b)}`,
+  };
+
+  return {
+    ...color,
+    alpha: (value?: number) => {
+      if (value === undefined) return clampAlpha(channels.a);
+      return createColor({ ...channels, a: value });
+    },
+  };
+}
+
+function parseHex(input: string): ColorChannels | null {
+  const short = input.match(/^#([0-9a-f]{3})$/i);
+  if (short) {
+    const [r, g, b] = short[1].split("");
+    return {
+      r: parseInt(`${r}${r}`, 16),
+      g: parseInt(`${g}${g}`, 16),
+      b: parseInt(`${b}${b}`, 16),
+      a: 1,
+    };
+  }
+
+  const long = input.match(/^#([0-9a-f]{6})$/i);
+  if (!long) return null;
+
+  return {
+    r: parseInt(long[1].slice(0, 2), 16),
+    g: parseInt(long[1].slice(2, 4), 16),
+    b: parseInt(long[1].slice(4, 6), 16),
+    a: 1,
+  };
+}
+
+function parseRgb(input: string): ColorChannels | null {
+  const match = input.match(
+    /rgba?\(\s*([\d.]+)\s*,\s*([\d.]+)\s*,\s*([\d.]+)(?:\s*,\s*([\d.]+))?\s*\)/i,
+  );
+  if (!match) return null;
+
+  return {
+    r: Number(match[1]),
+    g: Number(match[2]),
+    b: Number(match[3]),
+    a: match[4] !== undefined ? Number(match[4]) : 1,
+  };
+}
+
+function Color(input: string) {
+  const channels = parseHex(input) ?? parseRgb(input);
+  if (!channels) {
+    throw new Error(`Unable to parse color: ${input}`);
+  }
+  return createColor(channels);
+}
+
+Color.rgb = (r: number, g: number, b: number) => createColor({ r, g, b, a: 1 });
+
+export default Color;