Fix ordinary-Sunday precedence and unify getDayLabel's commemoration rendering

Two related fixes surfaced while chasing why St. Gregory Thaumaturgus
appeared to be misdated on Nov 18:

- calendar/commemorations.ts's `ordinary-sunday` case was transferring a
  Semiduplex (or lower) saint off the Sunday instead of commemorating it
  in place — an earlier, unverified guess. Live-verified against both
  Tridentine 1906 and Divino Afflatu 1954 (St. Gregory Thaumaturgus, St.
  Clement, St. Apollinaris, St. Thomas Becket, all real cases): the saint
  stays and is commemorated on the Sunday itself, same as Simplex, never
  pushed to the next open day. This is what was actually moving Gregory
  onto Nov 18 — not a data error. `applyChristmasOctaveSunday`'s own
  Dec 26-29 special case needed a matching adjustment (per its own
  documented intent, the displaced saint there is deliberately *not*
  commemorated in place, since he reappears in full on Dec 30 instead).

- getDayLabel had five branches, each hand-assembling its own
  filter/format logic for which commemorations to show — which is why
  the octave phrasing, the closing-day title, and a missing Sunday
  commemoration turned into three separate bugs earlier instead of one.
  Replaced with a single shared `collectCommemorations` used by every
  branch. This also exposed that the sanctoral-winner branch never
  showed any commemorated saint at all, and every other branch only
  showed the *first* one (`.find()`), silently dropping real collisions
  — both now show every commemorated saint, matching this app's own
  generous-commemoration design.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
2026-08-18 10:59:50 -04:00
parent 3f07d6e8d3
commit f43f030a6a
9 changed files with 281 additions and 123 deletions
+8 -3
View File
@@ -122,11 +122,16 @@ describe('decideOccurrence — ordinary-sunday', () => {
expect(result.transfer).toBeUndefined();
});
it('semiduplex gets nothing here — transfers forward', () => {
it('semiduplex stays and is commemorated, not transferred', () => {
// Live-verified (both Tridentine 1906 and Divino Afflatu 1954): St.
// Gregory Thaumaturgus (Semiduplex) lands on the 6th Sunday after
// Epiphany and is commemorated right there, not pushed to the next
// open day — same treatment as Simplex above, not a separate
// "too important to merely commemorate" tier.
const result = decideOccurrence('ordinary-sunday', 'post-epiphany-2', saint('semiduplex'));
expect(result.winner).toEqual({ kind: 'temporal', id: 'post-epiphany-2' });
expect(result.commemorations).toEqual([]);
expect(result.transfer).toEqual({ candidate: saint('semiduplex'), direction: 'forward' });
expect(result.commemorations).toEqual([{ kind: 'sanctoral', id: 'x', name: 'St. Ereden', rank: 'semiduplex' }]);
expect(result.transfer).toBeUndefined();
});
it('vigil gets nothing here — transfers backward', () => {