Merge pull request #131 from Neuvernetzung/feat#130

If Version is last key of Calendar Object, leftover line breaks break…
Neuvernetzung · Dec 1, 2024 · 40c711f · 40c711f
2 parents 48b4455 + 9f05bb4
commit 40c711f
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/.changeset/empty-bobcats-mix.md b/.changeset/empty-bobcats-mix.md
@@ -0,0 +1,5 @@
+---
+"ts-ics": patch
+---
+
+If Version is last key of Calendar Object, leftover line breaks break validation #130
diff --git a/packages/ts-ics/src/lib/parse/utils/splitLines.test.ts b/packages/ts-ics/src/lib/parse/utils/splitLines.test.ts
@@ -40,3 +40,21 @@ it("Correctly handle LF line breaks - when importing as LF (Linux readFile)", as
 
   expect(splitLines(formatted).join(LF_BREAK)).toEqual(unformatted);
 });
+
+it("Correct removal of leading and trailing line breaks - if there is more than one", async () => {
+  const formatted = icsTestData([
+    "",
+    "",
+    "",
+    "PRODID:ID",
+    "VERSION:2.0",
+    "",
+    "",
+    "",
+  ]);
+
+  const lines = splitLines(formatted);
+
+  expect(lines[0]).not.toEqual("\n");
+  expect(lines[lines.length - 1].endsWith("\n")).toEqual(false);
+});
diff --git a/packages/ts-ics/src/lib/parse/utils/splitLines.ts b/packages/ts-ics/src/lib/parse/utils/splitLines.ts
@@ -9,9 +9,16 @@ export const splitLines = (str: string) => {
 
   const rawLines = str.split(BREAK_REGEX);
 
-  // remove forgotten linebreaks infront and after
-  if (rawLines[0] === "") rawLines.shift();
-  if (rawLines[rawLines.length - 1] === "") rawLines.pop();
+  // remove forgotten leading linebreaks
+  while (rawLines[0] === "") rawLines.shift();
+
+  let endIndex = rawLines.length;
+
+  // remove forgotten trailing linebreaks #130
+  while (endIndex > 0 && rawLines[endIndex - 1] === "") {
+    endIndex -= 1;
+    rawLines.pop();
+  }
 
   for (let i = 0; i < rawLines.length; ) {
     let line = rawLines[i];

diff --git a/packages/ts-ics/tests/parse/calendar.test.ts b/packages/ts-ics/tests/parse/calendar.test.ts
@@ -186,3 +186,22 @@ it("Parse Apple ICS Calendar", async () => {
 
   expect(() => parseIcsCalendar(calendar)).not.toThrow();
 });
+
+it("Leftover line breaks should not affect parsing - #130", async () => {
+  const calendar = icsTestData([
+    "BEGIN:VCALENDAR",
+    "PRODID:ID",
+    "VERSION:2.0",
+    "BEGIN:VEVENT",
+    "CREATED:20240112T095511Z",
+    "DTEND:20240112T105511Z",
+    "DTSTAMP:20240112T095511Z",
+    "DTSTART:20240112T095511Z",
+    "SUMMARY:Test",
+    "UID:d908f270-64fa-4916-9f72-b48eb7222a64",
+    "END:VEVENT",
+    "END:VCALENDAR",
+  ]);
+
+  expect(() => parseIcsCalendar(calendar)).not.toThrow();
+});