72033221c3
Terce, Sext, and None each had a byte-identical 'hymn' case (resolveCommon(part.textRef.id), no doxology mechanism, no override/ season tiering). Replace all three with a single shared resolveSelfContainedHymn helper in resolve-common.ts. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F25189JqjXddUhU9hM9nUS
86 lines
3.2 KiB
TypeScript
86 lines
3.2 KiB
TypeScript
import type { HourDefinition, HourPart, ResolvedOrdo, ResolvedPart } from './types';
|
|
import type { LiturgicalDay, Weekday } from '../calendar/types';
|
|
import { resolveDay } from '../calendar';
|
|
import { getDayLabel } from '../calendar/day-label';
|
|
import { getPsalmsFor } from '../psalter/distribution';
|
|
import { getPsalmVerses } from '../psalter';
|
|
import { getOpeningVersicleId } from './opening-versicle';
|
|
import { applyFlexaMark } from './antiphon';
|
|
import {
|
|
resolveCommon,
|
|
getDayCollect,
|
|
openingAntiphon,
|
|
resolveOfficeWinner,
|
|
resolveMinorHourAntiphon,
|
|
resolveMinorHourChapter,
|
|
resolveSelfContainedHymn,
|
|
} from './resolve-common';
|
|
import terceDefinitionData from '../data/hours/terce.yml';
|
|
import antiphonsData from '../data/hours/terce-antiphons.yml';
|
|
|
|
const terceDefinition = terceDefinitionData as HourDefinition;
|
|
const antiphons = antiphonsData as Record<Weekday, Partial<Record<string, string>>>;
|
|
|
|
function resolvePart(part: HourPart, day: LiturgicalDay): ResolvedPart[] {
|
|
switch (part.kind) {
|
|
case 'opening-versicle':
|
|
return [{ kind: 'versicle', text: resolveCommon(getOpeningVersicleId(day.season, day.winner)) }];
|
|
case 'hymn':
|
|
return resolveSelfContainedHymn(part);
|
|
case 'chapter':
|
|
return [{ kind: 'chapter', text: resolveMinorHourChapter('terce', day, part.textRef.id) }];
|
|
case 'day-collect':
|
|
return [{ kind: 'prayer', text: getDayCollect(day) }];
|
|
case 'preces':
|
|
return [{ kind: 'preces', text: resolveCommon(part.textRef.id), label: part.label }];
|
|
case 'variable': {
|
|
// Only 'by-weekday' applies here — one antiphon framing all three
|
|
// psalms, no closing repeat (unlike Prime): confirmed directly
|
|
// against the engine, Capitulum follows the third psalm immediately.
|
|
const psalmRefs = getPsalmsFor('terce', day.weekday);
|
|
const opening = openingAntiphon(resolveMinorHourAntiphon('terce', day, antiphons[day.weekday]), resolveOfficeWinner(day));
|
|
return psalmRefs.map((ref, i) => {
|
|
const rawVerses = getPsalmVerses(ref.number, ref.verses).map((v) => ({ n: v.n, text: v.text, status: v.status }));
|
|
const { verses, antiphon } = applyFlexaMark(rawVerses, i === 0 ? opening : undefined);
|
|
return {
|
|
kind: 'psalm' as const,
|
|
psalmNumber: ref.number,
|
|
antiphon,
|
|
verses,
|
|
};
|
|
});
|
|
}
|
|
// Not used by Terce.
|
|
case 'prayer':
|
|
case 'responsory':
|
|
case 'versicle':
|
|
case 'psalm':
|
|
case 'canticle':
|
|
case 'lesson':
|
|
case 'martyrology':
|
|
case 'rule-reading':
|
|
case 'by-day-kind':
|
|
case 'creed':
|
|
case 'closing-antiphon':
|
|
case 'nunc-dimittis':
|
|
case 'marian-antiphon':
|
|
case 'lauds-psalmody':
|
|
case 'lauds-office':
|
|
case 'benedictus':
|
|
case 'suffrages':
|
|
case 'lauds-preces':
|
|
case 'day-collects':
|
|
case 'vespers-psalmody':
|
|
case 'vespers-office':
|
|
case 'magnificat':
|
|
case 'vespers-preces':
|
|
throw new Error(`Terce's ordo doesn't support a '${part.kind}' part`);
|
|
}
|
|
}
|
|
|
|
export function resolveOrdo(date: string): ResolvedOrdo {
|
|
const day = resolveDay(date);
|
|
const parts = terceDefinition.parts.flatMap((part) => resolvePart(part, day));
|
|
return { hourId: 'terce', date, parts, dayLabel: getDayLabel(day) };
|
|
}
|