@svar-ui/calendar-ical 2.6.0 → 2.7.0

package/dist/index.d.mts

@@ -6,6 +6,16 @@ interface CalendarEvent {
   end: Date;
   allDay?: boolean;
   text?: string;
+  /** iCal RRULE of a recurring master */
+  rrule?: string;
+  /** occurrences removed from the series */
+  exdates?: Date[];
+  /** set on an exception: the master it belongs to */
+  masterEventId?: EventID;
+  /** set on an exception: the occurrence it replaces */
+  originalDate?: Date;
+  /** single instance duration in ms, set by the store on a master */
+  duration?: number;
   [key: string]: any;
 }
 //#endregion

package/dist/index.mjs

@@ -1,80 +1,157 @@
 //#region src/parse.ts
+const DURATION_RE = /^P(?:(\d+)W)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/;
 function unfold(ics) {
 	return ics.replace(/\r?\n[ \t]/g, "");
 }
 function parseDate(value) {
-	if (/^\d{8}$/.test(value)) {
-		const y = +value.slice(0, 4);
-		const m = +value.slice(4, 6) - 1;
-		const d = +value.slice(6, 8);
-		return {
-			date: new Date(y, m, d),
-			allDay: true
-		};
-	}
-	if (value.endsWith("Z")) {
-		const y = +value.slice(0, 4);
-		const mo = +value.slice(4, 6) - 1;
-		const d = +value.slice(6, 8);
-		const h = +value.slice(9, 11);
-		const mi = +value.slice(11, 13);
-		const s = +value.slice(13, 15);
-		return {
-			date: new Date(Date.UTC(y, mo, d, h, mi, s)),
-			allDay: false
-		};
-	}
 	const y = +value.slice(0, 4);
 	const mo = +value.slice(4, 6) - 1;
 	const d = +value.slice(6, 8);
+	if (/^\d{8}$/.test(value)) return {
+		date: new Date(y, mo, d),
+		allDay: true
+	};
 	const h = +value.slice(9, 11);
 	const mi = +value.slice(11, 13);
 	const s = +value.slice(13, 15);
+	if (value.endsWith("Z")) return {
+		date: new Date(Date.UTC(y, mo, d, h, mi, s)),
+		allDay: false
+	};
 	return {
 		date: new Date(y, mo, d, h, mi, s),
 		allDay: false
 	};
 }
+function addDuration$1(start, value) {
+	const match = value.trim().match(DURATION_RE);
+	if (!match) return null;
+	const [, w, d, h, mi, s] = match;
+	const days = +(w || 0) * 7 + +(d || 0);
+	const ms = +(h || 0) * 36e5 + +(mi || 0) * 6e4 + +(s || 0) * 1e3;
+	if (!days && !ms) return null;
+	const end = new Date(start);
+	if (days) end.setDate(end.getDate() + days);
+	return ms ? new Date(end.getTime() + ms) : end;
+}
 function unescapeText(value) {
 	return value.replace(/\\n/g, "\n").replace(/\\,/g, ",").replace(/\\;/g, ";").replace(/\\\\/g, "\\");
 }
+function parseLine(line) {
+	const colon = line.indexOf(":");
+	if (colon === -1) return null;
+	const [key, ...paramParts] = line.slice(0, colon).split(";");
+	const params = {};
+	for (const part of paramParts) {
+		const eq = part.indexOf("=");
+		if (eq > 0) params[part.slice(0, eq).toUpperCase()] = part.slice(eq + 1);
+	}
+	return {
+		key: key.toUpperCase(),
+		prop: {
+			value: line.slice(colon + 1),
+			params
+		}
+	};
+}
+function first(props, key) {
+	return props[key]?.[0]?.value;
+}
+function occurrenceKey(date) {
+	const pad = (value) => String(value).padStart(2, "0");
+	return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}T${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`;
+}
+function toEventId(uid) {
+	return isNaN(Number(uid)) ? uid : Number(uid);
+}
+function buildEntry(props) {
+	const startRaw = first(props, "DTSTART");
+	if (!startRaw) return null;
+	const { date: start, allDay } = parseDate(startRaw);
+	const endRaw = first(props, "DTEND");
+	const durationRaw = first(props, "DURATION");
+	let end = start;
+	if (endRaw) end = parseDate(endRaw).date;
+	else if (durationRaw) end = addDuration$1(start, durationRaw) ?? start;
+	const uid = first(props, "UID") ?? `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+	const event = {
+		id: toEventId(uid),
+		start,
+		end
+	};
+	if (allDay) event.allDay = true;
+	const summary = first(props, "SUMMARY");
+	if (summary) event.text = unescapeText(summary);
+	const description = first(props, "DESCRIPTION");
+	if (description) event.description = unescapeText(description);
+	const rrule = first(props, "RRULE");
+	if (rrule) event.rrule = rrule;
+	const exdates = [];
+	for (const prop of props["EXDATE"] ?? []) for (const part of prop.value.split(",")) if (part) exdates.push(parseDate(part).date);
+	if (exdates.length) event.exdates = exdates;
+	const recurrenceRaw = first(props, "RECURRENCE-ID");
+	if (!recurrenceRaw) return {
+		uid,
+		event
+	};
+	const recurrenceId = parseDate(recurrenceRaw).date;
+	return {
+		uid,
+		event,
+		recurrenceId,
+		recurrenceKey: occurrenceKey(recurrenceId)
+	};
+}
 function parseICal(ics) {
 	const lines = unfold(ics).split(/\r?\n/);
-	const events = [];
-	let current = null;
-	for (const line of lines) if (line === "BEGIN:VEVENT") current = {};
-	else if (line === "END:VEVENT" && current) {
-		const uid = current["UID"];
-		const startRaw = current["DTSTART"] ?? "";
-		const endRaw = current["DTEND"] ?? "";
-		if (startRaw) {
-			const { date: start, allDay } = parseDate(startRaw);
-			const { date: end } = endRaw ? parseDate(endRaw) : { date: start };
-			const event = {
-				id: uid ? isNaN(Number(uid)) ? uid : Number(uid) : `${Date.now()}-${Math.random().toString(36).slice(2)}`,
-				start,
-				end
-			};
-			if (allDay) event.allDay = true;
-			if (current["SUMMARY"]) event.text = unescapeText(current["SUMMARY"]);
-			if (current["DESCRIPTION"]) event.description = unescapeText(current["DESCRIPTION"]);
-			events.push(event);
+	const entries = [];
+	let props = null;
+	let nested = 0;
+	for (const line of lines) {
+		if (props === null) {
+			if (line === "BEGIN:VEVENT") {
+				props = {};
+				nested = 0;
+			}
+			continue;
+		}
+		if (nested === 0 && line === "END:VEVENT") {
+			const entry = buildEntry(props);
+			if (entry) entries.push(entry);
+			props = null;
+			continue;
+		}
+		if (line.startsWith("BEGIN:")) {
+			nested++;
+			continue;
 		}
-		current = null;
-	} else if (current !== null) {
-		const colonIdx = line.indexOf(":");
-		if (colonIdx === -1) continue;
-		const baseKey = line.slice(0, colonIdx).split(";")[0];
-		const value = line.slice(colonIdx + 1);
-		current[baseKey] = value;
+		if (line.startsWith("END:")) {
+			if (nested > 0) nested--;
+			continue;
+		}
+		if (nested > 0) continue;
+		const parsed = parseLine(line);
+		if (parsed) (props[parsed.key] ??= []).push(parsed.prop);
+	}
+	const masters = /* @__PURE__ */ new Map();
+	for (const entry of entries) if (!entry.recurrenceId && !masters.has(entry.uid)) masters.set(entry.uid, entry);
+	for (const entry of entries) {
+		const master = entry.recurrenceId && masters.get(entry.uid);
+		if (!master) continue;
+		entry.event.id = `${entry.uid}-${entry.recurrenceKey}`;
+		entry.event.masterEventId = master.event.id;
+		entry.event.originalDate = entry.recurrenceId;
 	}
-	return events;
+	return entries.map((entry) => entry.event);
 }
 //#endregion
 //#region src/serialize.ts
+function pad(value) {
+	return String(value).padStart(2, "0");
+}
 function formatDate(date, allDay) {
-	if (allDay) return `${date.getFullYear()}${String(date.getMonth() + 1).padStart(2, "0")}${String(date.getDate()).padStart(2, "0")}`;
-	return `${date.getUTCFullYear()}${String(date.getUTCMonth() + 1).padStart(2, "0")}${String(date.getUTCDate()).padStart(2, "0")}T${String(date.getUTCHours()).padStart(2, "0")}${String(date.getUTCMinutes()).padStart(2, "0")}${String(date.getUTCSeconds()).padStart(2, "0")}Z`;
+	if (allDay) return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}`;
+	return `${`${date.getUTCFullYear()}${pad(date.getUTCMonth() + 1)}${pad(date.getUTCDate())}`}T${`${pad(date.getUTCHours())}${pad(date.getUTCMinutes())}${pad(date.getUTCSeconds())}`}Z`;
 }
 function escapeText(value) {
 	return value.replace(/\\/g, "\\\\").replace(/,/g, "\\,").replace(/;/g, "\\;").replace(/\n/g, "\\n");
@@ -89,6 +166,20 @@ function foldLine(line) {
 	}
 	return chunks.join("\r\n");
 }
+function addDuration(start, duration, allDay) {
+	if (!allDay) return new Date(start.getTime() + duration);
+	const days = Math.max(1, Math.round(duration / 864e5));
+	const end = new Date(start);
+	end.setDate(end.getDate() + days);
+	return end;
+}
+function instanceEnd(event, allDay) {
+	const duration = Number(event.duration);
+	return event.rrule && Number.isFinite(duration) ? addDuration(event.start, duration, allDay) : event.end;
+}
+function isException(event) {
+	return event.masterEventId != null && event.originalDate instanceof Date;
+}
 function serializeICal(events) {
 	const now = formatDate(/* @__PURE__ */ new Date(), false);
 	const lines = [
@@ -96,17 +187,25 @@ function serializeICal(events) {
 		"VERSION:2.0",
 		"PRODID:-//wx//calendar-ical//EN"
 	];
+	const masters = new Map(events.map((ev) => [ev.id, ev]));
 	for (const ev of events) {
 		const allDay = ev.allDay ?? false;
+		const dateParam = allDay ? ";VALUE=DATE" : "";
 		lines.push("BEGIN:VEVENT");
-		lines.push(`UID:${ev.id}`);
+		lines.push(`UID:${isException(ev) ? ev.masterEventId : ev.id}`);
 		lines.push(`DTSTAMP:${now}`);
-		if (allDay) {
-			lines.push(`DTSTART;VALUE=DATE:${formatDate(ev.start, true)}`);
-			lines.push(`DTEND;VALUE=DATE:${formatDate(ev.end, true)}`);
-		} else {
-			lines.push(`DTSTART:${formatDate(ev.start, false)}`);
-			lines.push(`DTEND:${formatDate(ev.end, false)}`);
+		if (isException(ev)) {
+			const master = masters.get(ev.masterEventId);
+			const idAllDay = (master ? master.allDay : ev.allDay) ?? false;
+			const idParam = idAllDay ? ";VALUE=DATE" : "";
+			lines.push(`RECURRENCE-ID${idParam}:${formatDate(ev.originalDate, idAllDay)}`);
+		}
+		lines.push(`DTSTART${dateParam}:${formatDate(ev.start, allDay)}`);
+		lines.push(`DTEND${dateParam}:${formatDate(instanceEnd(ev, allDay), allDay)}`);
+		if (ev.rrule) lines.push(`RRULE:${ev.rrule}`);
+		if (ev.exdates?.length) {
+			const dates = ev.exdates.map((d) => formatDate(d, allDay)).join(",");
+			lines.push(`EXDATE${dateParam}:${dates}`);
 		}
 		if (ev.text) lines.push(`SUMMARY:${escapeText(ev.text)}`);
 		if (ev.description) lines.push(`DESCRIPTION:${escapeText(String(ev.description))}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svar-ui/calendar-ical",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "iCal import/export for SVAR Calendar",
   "license": "MIT",
   "files": [
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "build": "vp pack",
-    "watch": "vp pack --watch",
+    "dev": "vp pack --watch",
     "test": "vp test",
     "check": "vp check"
   }