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:
@@ -53,7 +53,15 @@ describe('November sanctoral pull (first pass)', () => {
|
||||
expect(day.commemorations).toEqual([]);
|
||||
});
|
||||
|
||||
it('St. Clement transfers forward into St. Chrysogonus\'s day whenever his own date falls on a Sunday -- a single-day transfer this app models correctly, unlike August\'s multi-day-skip case', () => {
|
||||
it("St. Clement (Semiduplex) is commemorated on his own Sunday rather than transferring, so St. Chrysogonus's own following day is unaffected either way", () => {
|
||||
// Corrects an earlier, unverified assumption that a Semiduplex saint
|
||||
// landing on an ordinary Sunday transfers forward -- live-verified
|
||||
// (Divino Afflatu 1954) St. Clement is commemorated right there on
|
||||
// Nov 23 ("Commemoratio: S. Clementis Papæ et Martyris"), same
|
||||
// treatment Simplex already got (see calendar/commemorations.ts's
|
||||
// `ordinary-sunday` case). St. Felicitas (Simplex, also native to
|
||||
// Nov 23) is commemorated alongside him too, per this app's own
|
||||
// generous-commemoration design.
|
||||
const clean = resolveDay('2032-11-24'); // Nov 23, 2032 is not a Sunday
|
||||
expect(clean.winner).toEqual({
|
||||
kind: 'sanctoral',
|
||||
@@ -61,16 +69,22 @@ describe('November sanctoral pull (first pass)', () => {
|
||||
name: 'St. Chrysogonus, Martyr',
|
||||
rank: 'simplex',
|
||||
});
|
||||
const transferred = resolveDay('2025-11-24'); // Nov 23, 2025 IS a Sunday
|
||||
expect(transferred.winner).toEqual({
|
||||
kind: 'sanctoral',
|
||||
id: 'st-clement',
|
||||
name: 'St. Clement I, Pope and Martyr',
|
||||
rank: 'semiduplex',
|
||||
});
|
||||
expect(transferred.commemorations).toEqual([
|
||||
{ kind: 'sanctoral', id: 'st-chrysogonus', name: 'St. Chrysogonus, Martyr', rank: 'simplex' },
|
||||
const onceASunday = resolveDay('2025-11-23'); // a Sunday
|
||||
expect(onceASunday.winner).toEqual({ kind: 'temporal', id: 'post-pentecost-24' });
|
||||
expect(onceASunday.commemorations).toEqual([
|
||||
{ kind: 'sanctoral', id: 'st-clement', name: 'St. Clement I, Pope and Martyr', rank: 'semiduplex' },
|
||||
{ kind: 'sanctoral', id: 'st-felicitas', name: 'St. Felicitas, Martyr', rank: 'simplex' },
|
||||
]);
|
||||
// St. Chrysogonus's own following day is untouched either way -- no
|
||||
// incoming transfer any more.
|
||||
const followingDay = resolveDay('2025-11-24');
|
||||
expect(followingDay.winner).toEqual({
|
||||
kind: 'sanctoral',
|
||||
id: 'st-chrysogonus',
|
||||
name: 'St. Chrysogonus, Martyr',
|
||||
rank: 'simplex',
|
||||
});
|
||||
expect(followingDay.commemorations).toEqual([]);
|
||||
});
|
||||
|
||||
it('St. Andrew wins outright at Duplex II. classis with a real proper collect and antiphon, commemorating the Advent feria itself in years his fixed date falls within Advent', () => {
|
||||
|
||||
Reference in New Issue
Block a user