@remit/calendar-service 0.0.16 → 0.0.17

package/package.json

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

package/src/accept.test.ts

@@ -58,6 +58,7 @@ const suggestionOf = (
 	summary: "Quarterly review",
 	dtStart: "2026-09-01T08:00:00+00:00",
 	dtEnd: "2026-09-01T09:00:00+00:00",
+	endsAtUtc: "2026-09-01T09:00:00Z",
 	allDay: false,
 	location: "",
 	organizer: "organizer@example.test",

package/src/memory-store.ts

@@ -273,11 +273,17 @@ export class MemoryCalendarStore implements ICalendarUnitOfWork {
 		listByState: async (
 			accountConfigId: string,
 			state: CalendarSuggestionItem["state"],
+			options: {
+				endsAfter: string;
+				limit?: number;
+				continuationToken?: string;
+			},
 		) => ({
 			items: [...this.suggestions.values()].filter(
 				(suggestion) =>
 					suggestion.accountConfigId === accountConfigId &&
-					suggestion.state === state,
+					suggestion.state === state &&
+					suggestion.endsAtUtc >= options.endsAfter,
 			),
 			continuationToken: undefined,
 		}),

package/src/suggest.test.ts

@@ -71,9 +71,32 @@ describe("projectSuggestion", () => {
 		assert.equal(projected.value.organizer, "organizer@example.test");
 		assert.equal(projected.value.dtStart, "2026-09-01T10:00:00+02:00");
 		assert.equal(projected.value.dtEnd, "2026-09-01T11:00:00+02:00");
+		assert.equal(projected.value.endsAtUtc, "2026-09-01T09:00:00Z");
 		assert.equal(projected.value.allDay, false);
 	});
 
+	const withRule = (rule: string): string => invitation({ extra: [rule] });
+
+	it("ends a bounded series with its last occurrence", async () => {
+		const projected = await projectSuggestion(
+			withRule("RRULE:FREQ=WEEKLY;COUNT=3"),
+			"Europe/Amsterdam",
+		);
+
+		assert.ok(projected.ok);
+		assert.equal(projected.value.endsAtUtc, "2026-09-15T09:00:00Z");
+	});
+
+	it("never ends an open-ended series", async () => {
+		const projected = await projectSuggestion(
+			withRule("RRULE:FREQ=WEEKLY"),
+			"Europe/Amsterdam",
+		);
+
+		assert.ok(projected.ok);
+		assert.equal(projected.value.endsAtUtc, "9999-12-31T23:59:59Z");
+	});
+
 	it("reads a cancellation as a cancellation", async () => {
 		const projected = await projectSuggestion(
 			invitation({ method: "CANCEL", sequence: 2 }),
@@ -289,10 +312,12 @@ describe("recordCalendarSuggestion", () => {
 			listByState: async (
 				accountConfigId: string,
 				state: CalendarSuggestionItem["state"],
+				options: { endsAfter: string },
 			) => {
 				const page = await store.calendarSuggestion.listByState(
 					accountConfigId,
 					state,
+					options,
 				);
 				// The user accepts, right here.
 				await store.calendarSuggestion.settle(ACCOUNT_CONFIG_ID, target, {

package/src/suggest.ts

@@ -9,8 +9,14 @@ import {
 } from "@remit/domain-enums";
 import type ICAL from "ical.js";
 import type { CalendarResult } from "./errors.js";
+import { expandCalendar } from "./expand.js";
+import type { ParsedCalendar } from "./parse.js";
 import { parseCalendar } from "./parse.js";
 import { projectCalendar, readString } from "./project.js";
+import { toUtcIso } from "./time.js";
+
+const OPEN_ENDED_SERIES = "9999-12-31T23:59:59Z";
+const EARLIEST_INSTANT = new Date(0).toISOString();
 
 const METHOD_BY_ICAL: Record<string, CalendarSuggestionItem["method"]> = {
 	REQUEST: CalendarInviteMethod.Request,
@@ -48,12 +54,25 @@ export type CalendarSuggestionProjection = Pick<
 	| "summary"
 	| "dtStart"
 	| "dtEnd"
+	| "endsAtUtc"
 	| "allDay"
 	| "location"
 	| "organizer"
 	| "zoneCertainty"
 >;
 
+const endsAtUtcOf = (
+	calendar: ParsedCalendar,
+	timezone: string,
+	dtEnd: string,
+): string => {
+	const expansion = expandCalendar(calendar, timezone);
+	if (expansion.expandedThrough !== "") return OPEN_ENDED_SERIES;
+	const ends = expansion.occurrences.map((occurrence) => occurrence.endAt);
+	if (ends.length === 0) return toUtcIso(Date.parse(dtEnd));
+	return ends.reduce((latest, end) => (end > latest ? end : latest));
+};
+
 /**
  * Reads a message's `text/calendar` bytes into the facts a card is drawn from.
  *
@@ -80,6 +99,7 @@ export const projectSuggestion = async (
 			summary: projection.value.summary,
 			dtStart: projection.value.dtStart,
 			dtEnd: projection.value.dtEnd,
+			endsAtUtc: endsAtUtcOf(parsed.value, timezone, projection.value.dtEnd),
 			allDay: projection.value.allDay,
 			location: readString(parsed.value.master, "location"),
 			organizer: mailAddressOf(readString(parsed.value.master, "organizer")),
@@ -125,6 +145,7 @@ const listInState = async (
 	let continuationToken: string | undefined;
 	do {
 		const page = await repo.listByState(accountConfigId, state, {
+			endsAfter: EARLIEST_INSTANT,
 			continuationToken,
 		});
 		items.push(...page.items);