calendar: give Advent's ordinary ferias their own precedence tier
Deploy / deploy (push) Successful in 44s
Deploy / deploy (push) Successful in 44s
Found while starting the December sanctoral pull: Advent's plain (non-Ember) weekday ferias have real standing in the live Monastic 1617 engine that the existing ordinary-feria category couldn't represent -- a Simplex saint (St. Bibiana, Dec 2) is merely commemorated there rather than winning outright, while a Semiduplex+ saint (St. Nicholas, Dec 6) wins with the feria itself commemorated back. Adds a third, weaker privileged-feria-minor tier (Semiduplex+ threshold, vs. privileged- feria's Duplex+) rather than reusing either existing tier, mirroring how privileged-feria/privileged-feria-major were split in March. Lent's own ordinary ferias likely share this property but are left as-is, unverified this session. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -84,6 +84,18 @@ export function decideOccurrence(
|
|||||||
// feast, however low-ranked, is kept in its place.
|
// feast, however low-ranked, is kept in its place.
|
||||||
return { winner: sanctoralWinner(sanctoral), commemorations: [] };
|
return { winner: sanctoralWinner(sanctoral), commemorations: [] };
|
||||||
|
|
||||||
|
case 'privileged-feria-minor':
|
||||||
|
// Advent's own ordinary ferias (verified: St. Bibiana, Simplex,
|
||||||
|
// merely commemorated under an Advent feria; St. Nicholas,
|
||||||
|
// Semiduplex, wins outright with the feria commemorated in return).
|
||||||
|
// Weaker than `privileged-feria`'s Duplex+ threshold — Semiduplex is
|
||||||
|
// already enough here — and unlike every other feria tier, nothing
|
||||||
|
// ever transfers: whichever side loses still gets a commemoration.
|
||||||
|
if (isAtLeast(sanctoral.rank, 'semiduplex')) {
|
||||||
|
return { winner: sanctoralWinner(sanctoral), commemorations: [{ kind: 'temporal', id: temporalId }] };
|
||||||
|
}
|
||||||
|
return { winner: temporalWinner, commemorations: [sanctoralCommemoration(sanctoral)] };
|
||||||
|
|
||||||
case 'privileged-feria':
|
case 'privileged-feria':
|
||||||
// The lesser of the two privileged-feria tiers (Ember days outside
|
// The lesser of the two privileged-feria tiers (Ember days outside
|
||||||
// Holy Week/the Easter Octave, etc.) — behaves exactly like an
|
// Holy Week/the Easter Octave, etc.) — behaves exactly like an
|
||||||
|
|||||||
@@ -82,8 +82,19 @@ export type FeastClass =
|
|||||||
// categories.yml for exactly which days fall in which tier — some of that
|
// categories.yml for exactly which days fall in which tier — some of that
|
||||||
// split (e.g. whether Pentecost's own Ember days share Lent's lesser tier
|
// split (e.g. whether Pentecost's own Ember days share Lent's lesser tier
|
||||||
// or Easter's major one) is still a reconstructed guess, not verified.
|
// or Easter's major one) is still a reconstructed guess, not verified.
|
||||||
|
// `privileged-feria-minor` is a third, weaker tier, added during the
|
||||||
|
// December sanctoral pull after finding Advent's own ordinary (non-Ember)
|
||||||
|
// ferias have real standing of their own in the live engine — a Simplex
|
||||||
|
// saint (e.g. St. Bibiana, Dec 2) is merely commemorated there, while a
|
||||||
|
// Semiduplex+ saint (e.g. St. Nicholas, Dec 6) wins outright with the
|
||||||
|
// feria itself commemorated in return — neither of which the original
|
||||||
|
// `ordinary-feria` fallback (any saint wins, nothing ever commemorated)
|
||||||
|
// could represent. Lent's own ordinary ferias are documented as sharing
|
||||||
|
// this same real-world property but are NOT switched to this tier yet —
|
||||||
|
// unverified this session, left as `ordinary-feria` pending a future check.
|
||||||
export type TemporalCategory =
|
export type TemporalCategory =
|
||||||
| 'ordinary-feria'
|
| 'ordinary-feria'
|
||||||
|
| 'privileged-feria-minor'
|
||||||
| 'privileged-feria'
|
| 'privileged-feria'
|
||||||
| 'privileged-feria-major'
|
| 'privileged-feria-major'
|
||||||
| 'ordinary-sunday'
|
| 'ordinary-sunday'
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ function hasFirstVespers(day: LiturgicalDay): boolean {
|
|||||||
function keepsOwnSecondVespers(day: LiturgicalDay): boolean {
|
function keepsOwnSecondVespers(day: LiturgicalDay): boolean {
|
||||||
if (
|
if (
|
||||||
day.weekday === 'sunday' ||
|
day.weekday === 'sunday' ||
|
||||||
|
day.temporalCategory === 'privileged-feria-minor' ||
|
||||||
day.temporalCategory === 'privileged-feria' ||
|
day.temporalCategory === 'privileged-feria' ||
|
||||||
day.temporalCategory === 'privileged-feria-major' ||
|
day.temporalCategory === 'privileged-feria-major' ||
|
||||||
isMajorFixedFeastOfTheLord(day.date)
|
isMajorFixedFeastOfTheLord(day.date)
|
||||||
|
|||||||
@@ -34,7 +34,11 @@
|
|||||||
# Lent's and Pentecost's Ember days *are* modeled, since those are clean
|
# Lent's and Pentecost's Ember days *are* modeled, since those are clean
|
||||||
# Easter offsets.
|
# Easter offsets.
|
||||||
bySeason:
|
bySeason:
|
||||||
advent: { sunday: privileged-sunday, feria: ordinary-feria }
|
# Advent's ordinary ferias verified `privileged-feria-minor` during the
|
||||||
|
# December sanctoral pull (see calendar/types.ts's TemporalCategory doc
|
||||||
|
# comment) -- weaker than the Ember-day `privileged-feria` tier, but real
|
||||||
|
# standing nonetheless, unlike a plain `ordinary-feria`.
|
||||||
|
advent: { sunday: privileged-sunday, feria: privileged-feria-minor }
|
||||||
# Christmastide's ferias are folded into the privileged-feria default for
|
# Christmastide's ferias are folded into the privileged-feria default for
|
||||||
# the whole season as a simplification of "the Octave of Christmas (Dec
|
# the whole season as a simplification of "the Octave of Christmas (Dec
|
||||||
# 25 - Jan 1) is privileged" — slightly overbroad into Jan 2-5, harmless.
|
# 25 - Jan 1) is privileged" — slightly overbroad into Jan 2-5, harmless.
|
||||||
|
|||||||
@@ -41,6 +41,31 @@ describe('decideOccurrence — ordinary-feria', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('decideOccurrence — privileged-feria-minor', () => {
|
||||||
|
it('semiduplex or higher wins outright, the feria is commemorated in return', () => {
|
||||||
|
// Verified: St. Nicholas, Semiduplex, outright wins against an
|
||||||
|
// ordinary (non-Ember) Advent Saturday in the real Monastic 1617
|
||||||
|
// engine, with the feria itself commemorated back.
|
||||||
|
for (const rank of ['semiduplex', 'duplex', 'duplex-1-classis'] as const) {
|
||||||
|
const result = decideOccurrence('privileged-feria-minor', 'id', saint(rank));
|
||||||
|
expect(result.winner).toEqual({ kind: 'sanctoral', id: 'x', name: 'St. Ereden', rank });
|
||||||
|
expect(result.commemorations).toEqual([{ kind: 'temporal', id: 'id' }]);
|
||||||
|
expect(result.transfer).toBeUndefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('simplex or vigil stays and is commemorated, not transferred', () => {
|
||||||
|
// Verified: St. Bibiana, Simplex, merely commemorated under an
|
||||||
|
// ordinary Advent feria in the real Monastic 1617 engine.
|
||||||
|
for (const rank of ['simplex', 'vigil'] as const) {
|
||||||
|
const result = decideOccurrence('privileged-feria-minor', 'id', saint(rank));
|
||||||
|
expect(result.winner).toEqual({ kind: 'temporal', id: 'id' });
|
||||||
|
expect(result.commemorations).toEqual([{ kind: 'sanctoral', id: 'x', name: 'St. Ereden', rank }]);
|
||||||
|
expect(result.transfer).toBeUndefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe('decideOccurrence — privileged-feria', () => {
|
describe('decideOccurrence — privileged-feria', () => {
|
||||||
it('behaves exactly like an ordinary Sunday — duplex or higher wins outright, the feria is commemorated in return', () => {
|
it('behaves exactly like an ordinary Sunday — duplex or higher wins outright, the feria is commemorated in return', () => {
|
||||||
// Verified: St. Gregory the Great, plain Duplex, outright wins against
|
// Verified: St. Gregory the Great, plain Duplex, outright wins against
|
||||||
|
|||||||
@@ -73,7 +73,10 @@ describe('November sanctoral pull (first pass)', () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('St. Andrew wins outright at Duplex II. classis with a real proper collect and antiphon, alone', () => {
|
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', () => {
|
||||||
|
// 2026-11-30 is also the Monday within Advent I's own week that year
|
||||||
|
// (privileged-feria-minor, see calendar/types.ts) -- the Advent feria
|
||||||
|
// is commemorated back, confirmed against the live reference engine.
|
||||||
const day = resolveDay('2026-11-30');
|
const day = resolveDay('2026-11-30');
|
||||||
expect(day.winner).toEqual({
|
expect(day.winner).toEqual({
|
||||||
kind: 'sanctoral',
|
kind: 'sanctoral',
|
||||||
@@ -81,7 +84,7 @@ describe('November sanctoral pull (first pass)', () => {
|
|||||||
name: 'St. Andrew, Apostle',
|
name: 'St. Andrew, Apostle',
|
||||||
rank: 'duplex-2-classis',
|
rank: 'duplex-2-classis',
|
||||||
});
|
});
|
||||||
expect(day.commemorations).toEqual([]);
|
expect(day.commemorations).toEqual([{ kind: 'temporal', id: 'advent-1' }]);
|
||||||
expect(getDayCollect(day).status.en).toBe('verified');
|
expect(getDayCollect(day).status.en).toBe('verified');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user