refactor: flatten parseAndExpandEvents return value, expose isFullDay, remove ri alias

parseAndExpandEvents now returns a flat array instead of {events, occurrences}.
Events and occurrences have identical shapes; the split was a historical artefact
of the ical.js migration.

Add isFullDay: boolean to the event shape, computed from node-ical's
event.isFullDay / start.dateOnly. Removes the format("HHmmss")==="000000"
heuristic from node_helper.js.

Remove the redundant `ri = item` alias in node_helper.js forEach.

Author: KristjanESPERANTO

lib/ical-utils.js

@@ -151,6 +151,7 @@ const parseAndExpandEvents = (iCalData, startDate, endDate, maxIterations = 1000
           location: stringValue(occurrence.location) || stringValue(occurrenceEvent.location),
           description: stringValue(occurrence.description) || stringValue(occurrenceEvent.description),
           uid: stringValue(occurrence.uid) || stringValue(occurrenceEvent.uid),
+          isFullDay: Boolean(occurrence.isFullDay || occurrence.start?.dateOnly),
           isRecurring: true,
           duration: durationSeconds,
           status: eventProp(occurrence, "status") || eventProp(occurrenceEvent, "status"),
@@ -170,6 +171,7 @@ const parseAndExpandEvents = (iCalData, startDate, endDate, maxIterations = 1000
           location: stringValue(event.location),
           description: stringValue(event.description),
           uid: stringValue(event.uid),
+          isFullDay: Boolean(event.isFullDay || event.start?.dateOnly),
           isRecurring: false,
           duration: getDurationSeconds(event),
           status: eventProp(event, "status"),
@@ -180,10 +182,7 @@ const parseAndExpandEvents = (iCalData, startDate, endDate, maxIterations = 1000
     }
   }
 
-  return {
-    events,
-    occurrences
-  };
+  return [...events, ...occurrences];
 };
 
 module.exports = {

node_helper.js

@@ -125,19 +125,18 @@ module.exports = NodeHelper.create({
       return;
     }
 
-    const wholeEvents = [...events.events, ...events.occurrences];
+    const wholeEvents = events;
     let eventPool = [];
 
     wholeEvents.forEach((item) => {
-      const ri = item;
       const ev = {};
       ev.calendarId = calendar.uid;
-      ev.location = ri.location;
-      ev.description = ri.description;
-      ev.title = ri.summary;
-      ev.isRecurring = ri.isRecurring;
-      ev.attendees = ri.attendees || [];
-      ev.isCancelled = ri.status?.toUpperCase() === "CANCELLED";
+      ev.location = item.location;
+      ev.description = item.description;
+      ev.title = item.summary;
+      ev.isRecurring = item.isRecurring;
+      ev.attendees = item.attendees || [];
+      ev.isCancelled = item.status?.toUpperCase() === "CANCELLED";
       if (
         Array.isArray(calendar.replaceTitle) &&
         calendar.replaceTitle.length > 0
@@ -165,7 +164,7 @@ module.exports = NodeHelper.create({
       ev.endDate = endDate.unix();
       ev.startDateJ = startDate.toJSON();
       ev.endDateJ = endDate.toJSON();
-      ev.duration = ri.duration;
+      ev.duration = item.duration;
       ev.isMoment = ev.duration === 0;
       ev.isPassed = Boolean(endDate.isBefore(dayjs()));
       if (ev.duration <= 86400) {
@@ -177,19 +176,15 @@ module.exports = NodeHelper.create({
       }
       ev.className = calendar.className;
       ev.icon = calendar.icon;
-      const isFullday = Boolean(
-        startDate.format("HHmmss") === "000000" &&
-        endDate.format("HHmmss") === "000000"
-      );
-      ev.isFullday = isFullday;
+      ev.isFullday = item.isFullDay;
 
       // import the Microsoft property X-MICROSOFT-CDO-BUSYSTATUS, fall back to "BUSY" in case none was found
       // possible values are 'FREE'|'TENTATIVE'|'BUSY'|'OOF' according to
       // https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/cd68eae7-ed65-4dd3-8ea7-ad585c76c736
-      ev.ms_busystatus = ri.ms_busystatus || "BUSY";
+      ev.ms_busystatus = item.ms_busystatus || "BUSY";
 
-      ev.uid = ri.uid
-        ? `${calendar.uid}:${ev.startDate}:${ev.endDate}:${ri.uid}`
+      ev.uid = item.uid
+        ? `${calendar.uid}:${ev.startDate}:${ev.endDate}:${item.uid}`
         : `${calendar.uid}:${ev.startDate}:${ev.endDate}:${ev.title}`;
       ev.calendarName = calendar.name;
       if (calendar.filter) {

test/ical-utils.test.js

@@ -36,10 +36,9 @@ test("parses a non-recurring event with attendee extraction and obfuscation", ()
     new Date("2026-03-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
-  assert.equal(result.occurrences.length, 0);
+  assert.equal(result.length, 1);
 
-  const [event] = result.events;
+  const [event] = result;
   assert.equal(event.summary, "Team Sync");
   assert.equal(event.location, "Office");
   assert.equal(event.description, "Weekly team sync");
@@ -74,8 +73,7 @@ test("ignores non-recurring events outside requested window", () => {
     new Date("2026-04-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 0);
-  assert.equal(result.occurrences.length, 0);
+  assert.equal(result.length, 0);
 });
 
 test("expands recurring events and applies EXDATE exclusions", () => {
@@ -99,18 +97,17 @@ test("expands recurring events and applies EXDATE exclusions", () => {
     new Date("2026-02-07T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 0);
-  assert.equal(result.occurrences.length, 4);
+  assert.equal(result.length, 4);
 
-  const starts = result.occurrences.map((occurrence) => occurrence.start.toISOString());
+  const starts = result.map((occurrence) => occurrence.start.toISOString());
   assert.deepEqual(starts, [
     "2026-02-01T10:00:00.000Z",
     "2026-02-02T10:00:00.000Z",
     "2026-02-04T10:00:00.000Z",
     "2026-02-05T10:00:00.000Z"
   ]);
 
-  for (const occurrence of result.occurrences) {
+  for (const occurrence of result) {
     assert.equal(occurrence.isRecurring, true);
   }
 });
@@ -136,7 +133,7 @@ test("respects maxIterations for recurring expansion", () => {
     2
   );
 
-  assert.equal(result.occurrences.length, 2);
+  assert.equal(result.length, 2);
 });
 
 test("uses default attendee metadata when optional params are missing", () => {
@@ -159,8 +156,8 @@ test("uses default attendee metadata when optional params are missing", () => {
     new Date("2026-06-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
-  assert.deepEqual(result.events[0].attendees[0], {
+  assert.equal(result.length, 1);
+  assert.deepEqual(result[0].attendees[0], {
     name: "someone@***.com",
     email: "someone@***.com",
     status: "NEEDS-ACTION",
@@ -187,10 +184,11 @@ test("parses all-day events with correct duration and date span", () => {
     new Date("2026-03-31T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
+  assert.equal(result.length, 1);
 
-  const event = result.events[0];
+  const event = result[0];
   assert.equal(event.summary, "Holiday");
+  assert.equal(event.isFullDay, true, "all-day event should have isFullDay=true");
   assert.equal(event.duration, 86400, "all-day event should be exactly 86400s");
 
   const startMs = event.start.getTime();
@@ -217,9 +215,10 @@ test("provides correct endDate and duration for timed events", () => {
     new Date("2026-03-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
+  assert.equal(result.length, 1);
 
-  const event = result.events[0];
+  const event = result[0];
+  assert.equal(event.isFullDay, false, "timed event should have isFullDay=false");
   assert.equal(
     event.end.toISOString(),
     "2026-03-01T11:30:00.000Z"
@@ -247,9 +246,10 @@ test("expands recurring all-day events with correct duration", () => {
     new Date("2026-03-31T00:00:00Z")
   );
 
-  assert.equal(result.occurrences.length, 3);
+  assert.equal(result.length, 3);
 
-  for (const occurrence of result.occurrences) {
+  for (const occurrence of result) {
+    assert.equal(occurrence.isFullDay, true, "recurring all-day should have isFullDay=true");
     assert.equal(occurrence.duration, 86400);
 
     const startMs = occurrence.start.getTime();
@@ -281,8 +281,8 @@ test("returns plain strings for properties that carry ICAL parameters (e.g. SUMM
     new Date("2026-03-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
-  const ev = result.events[0];
+  assert.equal(result.length, 1);
+  const ev = result[0];
   assert.equal(typeof ev.summary, "string", "summary must be a plain string");
   assert.equal(typeof ev.location, "string", "location must be a plain string");
   assert.equal(typeof ev.description, "string", "description must be a plain string");
@@ -311,8 +311,8 @@ test("exposes status=CANCELLED on a non-recurring event", () => {
     new Date("2026-03-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
-  const ev = result.events[0];
+  assert.equal(result.length, 1);
+  const ev = result[0];
   assert.equal(ev.status, "CANCELLED");
 });
 
@@ -336,8 +336,8 @@ test("exposes ms_busystatus for Microsoft X-CDO property", () => {
     new Date("2026-03-02T00:00:00Z")
   );
 
-  assert.equal(result.events.length, 1);
-  assert.equal(result.events[0].ms_busystatus, "OOF");
+  assert.equal(result.length, 1);
+  assert.equal(result[0].ms_busystatus, "OOF");
 });
 
 test("exposes status on a recurring occurrence (from parent event)", () => {
@@ -361,8 +361,8 @@ test("exposes status on a recurring occurrence (from parent event)", () => {
     new Date("2026-03-05T00:00:00Z")
   );
 
-  assert.equal(result.occurrences.length, 2);
-  for (const occurrence of result.occurrences) {
+  assert.equal(result.length, 2);
+  for (const occurrence of result) {
     assert.equal(occurrence.status, "CANCELLED");
   }
 });