Merge pull request #26 from natekspencer/fix-4-week-calendar

Fix calendar generation for month/year combinations with exactly 4 full weeks (28 days)

Author: jottenlips

php/tests/CalendarTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Vestaboard\Vbml\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Vestaboard\Vbml\Calendar;
+
+class CalendarTest extends TestCase
+{
+    public function testShouldCreateCalendarWithOnly4Weeks(): void
+    {
+        $result = Calendar::makeCalendar(
+            '2',
+            '2026',
+            []
+        );
+        $this->assertEquals([
+            [28, 59, 28, 32, 0, 19, 13, 20, 23, 20, 6, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            [0, 27, 44, 33, 0, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            [0, 34, 44, 27, 30, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            [27, 31, 44, 28, 27, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            [28, 28, 44, 28, 34, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        ], $result);
+    }
+}

python/pyvbml/calendar.py

@@ -59,7 +59,7 @@ def make_calendar(
     fifth_row_days = (
         [str(fifth_start), str(fifth_end)] if fifth_start <= num_days else None
     )
-    num_days_last_row = fifth_end - (7 - offset + 22) + 1
+    num_days_last_row = fifth_end - fifth_start + 1
 
     def dc(digit: str) -> int:
         """Digit → character code, or 0 when dates are hidden."""

src/__tests__/calendar.spec.ts

@@ -0,0 +1,19 @@
+import { makeCalendar } from "../calendar";
+
+describe("Calendar", () => {
+  it("Should create calendar with only 4 weeks", () => {
+    const result = makeCalendar(
+      "2",
+      "2026",
+      {},
+    );
+    expect(result).toEqual([
+      [28, 59, 28, 32, 0, 19, 13, 20, 23, 20, 6, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      [0, 27, 44, 33, 0, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      [0, 34, 44, 27, 30, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      [27, 31, 44, 28, 27, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      [28, 28, 44, 28, 34, 65, 65, 65, 65, 65, 65, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    ]);
+  });
+});

src/calendar.ts

@@ -46,14 +46,12 @@ export const makeCalendar = (
   const secondRowDays = [`${7 - offset + 1}`, `${7 - offset + 7}`];
   const thirdRowDays = [`${7 - offset + 8}`, `${7 - offset + 14}`];
   const fourthRowDays = [`${7 - offset + 15}`, `${7 - offset + 21}`];
-  const fifthRowDays = [
-    `${7 - offset + 22}`,
-    `${Math.min(7 - offset + numberOfDaysInMonth, numberOfDaysInMonth)}`,
-  ];
-  const numberOfDaysInLastRow =
-    Math.min(7 - offset + numberOfDaysInMonth, numberOfDaysInMonth) -
-    (7 - offset + 22) +
-    1;
+  const fifthStart = 7 - offset + 22;
+  const fifthEnd = Math.min(7 - offset + numberOfDaysInMonth, numberOfDaysInMonth);
+  const fifthRowDays = fifthStart <= numberOfDaysInMonth
+    ? [`${fifthStart}`, `${fifthEnd}`]
+    : [];
+  const numberOfDaysInLastRow = fifthEnd - fifthStart + 1;
   const calendarDayColor = defaultDayColor || 65;
   const firstRow =
     firstRowDays[0] === firstRowDays[1]