sstent/silverbullet-icalendar
1
0
Fork 0
forked from GitHubMirrors/silverbullet-icalendar
Code Pull Requests Actions Packages Releases Activity

fix(icalendar): Correctly format nested objects (dates) in RRULE properties

Browse Source
This commit is contained in:
sstent
2026-02-20 13:37:11 -08:00
parent 31ca364a7c
commit e5b063269f
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
icalendar.ts
View File

@@ -29,6 +29,20 @@ const RRULE_KEY_MAP: Record<string, string> = {
"freq": "FREQ", // Just in case "freq": "FREQ", // Just in case
}; };
/**
* Formats an RRULE value for the string representation.
* Specifically handles Date objects and nested date objects from ts-ics.
*/
function formatRRuleValue(v: any): string {
if (v instanceof Date) {
return v.toISOString().replace(/[-:]/g, "").split(".")[0] + "Z";
}
if (typeof v === "object" && v !== null && v.date instanceof Date) {
return v.date.toISOString().replace(/[-:]/g, "").split(".")[0] + "Z";
}
return String(v);
}
// ============================================================================ // ============================================================================
// Utility Functions // Utility Functions
// ============================================================================ // ============================================================================
@@ -186,7 +200,7 @@ export function expandRecurrences(icsEvent: any, windowDays = 365): any[] {
cleanRule = Object.entries(rruleStr) cleanRule = Object.entries(rruleStr)
.map(([k, v]) => { .map(([k, v]) => {
const standardKey = RRULE_KEY_MAP[k.toLowerCase()] || k.toUpperCase(); const standardKey = RRULE_KEY_MAP[k.toLowerCase()] || k.toUpperCase();
return `${standardKey}=${v}`; return `${standardKey}=${formatRRuleValue(v)}`;
}) })
.join(";"); .join(";");
} else { } else {

25
icalendar_test.ts
View File

@@ -207,7 +207,7 @@ Deno.test("expandRecurrences - object rrule (Reproduction of missing events)", (
}); });
Deno.test("expandRecurrences - object rrule with until (Reproduction)", () => { Deno.test("expandRecurrences - object rrule with until", () => {
const now = new Date(); const now = new Date();
const start = new Date(now.getTime() - 10 * 86400000); const start = new Date(now.getTime() - 10 * 86400000);
const startStr = localDateString(start); const startStr = localDateString(start);
@@ -216,25 +216,12 @@ Deno.test("expandRecurrences - object rrule with until (Reproduction)", () => {
const icsEvent = { const icsEvent = {
summary: "Object RRULE UNTIL Event", summary: "Object RRULE UNTIL Event",
start: startStr, start: startStr,
rrule: { frequency: "DAILY", until: { date: untilDate } } // Common ts-ics structure rrule: { frequency: "DAILY", until: { date: untilDate } }
}; };
// Spy on console.error const results = expandRecurrences(icsEvent, 30);
let errorLogged = false; // Should now return multiple occurrences
const originalConsoleError = console.error; assert(results.length > 1, `Expected > 1 occurrences, got ${results.length}`);
console.error = (...args) => { assertEquals(results[0].recurrent, true);
if (args[0].includes("Error expanding recurrence for Object RRULE UNTIL Event") &&
args[1].message.includes("Invalid UNTIL value")) {
errorLogged = true;
}
};
try {
expandRecurrences(icsEvent, 30);
} finally {
console.error = originalConsoleError;
}
assert(errorLogged, "Should have logged an error for invalid UNTIL object value");
}); });