@remit/calendar-service 0.0.4 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/calendar-service",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "iCalendar (RFC 5545) parsing, projection and recurrence expansion over the calendar store",
   "type": "module",
   "main": "src/index.ts",

package/src/expand.test.ts

@@ -328,6 +328,24 @@ describe("expandCalendar", () => {
 		assert.notEqual(expansion.expandedThrough, "");
 	});
 
+	it("marks a series whose first occurrence falls past the horizon", async () => {
+		// The rule's own first instance is excluded, so the iterator's first slot
+		// is 2029 and the horizon closes in 2027. Nothing is written, but the
+		// series is not complete: `""` here would hide it from the live expansion
+		// and the event would render nowhere, ever.
+		const expansion = await expand(
+			singleEvent(
+				"DTSTART:20250301T090000Z",
+				"DTEND:20250301T100000Z",
+				"RRULE:FREQ=YEARLY;INTERVAL=4",
+				"EXDATE:20250301T090000Z",
+			),
+		);
+
+		assert.deepEqual(expansion.occurrences, []);
+		assert.equal(expansion.expandedThrough, "2025-03-01T09:00:00Z");
+	});
+
 	it("says nothing about a horizon for a series that ends inside it", async () => {
 		const expansion = await expand(
 			singleEvent(

package/src/expand.ts

@@ -107,7 +107,7 @@ interface Walk {
 	occurrences: CalendarOccurrenceInput[];
 	/** Whether the walk stopped on a bound rather than on the series ending. */
 	truncated: boolean;
-	/** Start of the last slot the iterator itself produced, or `""` for none. */
+	/** Start of the last slot the walk collected, or `""` when it collected none. */
 	lastIteratedStart: string;
 }
 
@@ -258,12 +258,19 @@ export const expandCalendar = (
 		maxSteps: Number.POSITIVE_INFINITY,
 	});
 
+	// Every truncated walk is marked, including one that collected nothing — a
+	// series whose first occurrence lands past the horizon. Its index is empty
+	// from the series start, which is the honest floor to write; `""` would
+	// claim the whole series is held and the live expansion would never run.
 	return {
 		occurrences: walk.occurrences,
-		expandedThrough:
-			walk.truncated && walk.lastIteratedStart
-				? toUtcIso(Date.parse(walk.lastIteratedStart))
-				: "",
+		expandedThrough: walk.truncated
+			? toUtcIso(
+					walk.lastIteratedStart
+						? Date.parse(walk.lastIteratedStart)
+						: seriesStart,
+				)
+			: "",
 	};
 };
 

package/src/window.test.ts

@@ -245,6 +245,52 @@ describe("listCalendarInstances", () => {
 		assert.equal(instances[0]?.summary, "Weekly one-to-one");
 	});
 
+	it("expands a series whose index is empty because its first occurrence is past the horizon", async () => {
+		const calendar = collection();
+		// The rule's own first instance is excluded, so the first occurrence is in
+		// 2029 and the horizon closed in 2027. The index holds no row at all, and
+		// the only thing that can serve the event is the live expansion.
+		const distant = await store(
+			calendar,
+			"distant.ics",
+			ical(
+				"BEGIN:VCALENDAR",
+				"VERSION:2.0",
+				"BEGIN:VEVENT",
+				"UID:distant@example.com",
+				"DTSTART:20250301T090000Z",
+				"DTEND:20250301T100000Z",
+				"SUMMARY:Leap day review",
+				"RRULE:FREQ=YEARLY;INTERVAL=4",
+				"EXDATE:20250301T090000Z",
+				"END:VEVENT",
+				"END:VCALENDAR",
+			),
+		);
+
+		assert.deepEqual(distant.rows, [], "the index really is empty");
+		assert.deepEqual(
+			await repositories([distant]).calendarObject.listIncompleteExpansions(
+				calendar.calendarId,
+				"2029-04-01T00:00:00Z",
+			),
+			[distant.object],
+			"and the resource is still offered to the live expansion",
+		);
+
+		const instances = await listCalendarInstances(
+			repositories([distant]),
+			[calendar],
+			{ from: "2029-03-01T00:00:00Z", to: "2029-04-01T00:00:00Z" },
+		);
+
+		assert.deepEqual(
+			instances.map((instance) => instance.startAt),
+			["2029-03-01T09:00:00Z"],
+		);
+		assert.equal(instances[0]?.summary, "Leap day review");
+	});
+
 	it("serves a live-expanded series from one source, never twice", async () => {
 		const calendar = collection();
 		const openEnded = await store(