chuvsu-js 4.2.0 → 5.0.1

package/dist/tt/parse/webinars.js

@@ -6,7 +6,7 @@ function parseDateValue(value) {
     const match = value?.match(/^(\d{4})-(\d{2})-(\d{2})$/);
     if (!match)
         return undefined;
-    return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+    return `${match[1]}-${match[2]}-${match[3]}`;
 }
 function parseTimeRange(raw) {
     const match = raw.match(/(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
@@ -71,10 +71,9 @@ function parseWebinarRows(doc, tableSelector, scheduled, fallbackDate) {
                 id: joinMatch?.[1] ?? "",
                 idType: joinMatch ? parseInt(joinMatch[2]) : 1,
                 scheduled,
-                date,
+                scheduledDate: date,
                 slotNumber,
-                timeStart: timeRange.start,
-                timeEnd: timeRange.end,
+                time: timeRange,
                 subject: parsed.subject,
                 type: parsed.type,
                 teacher: parseTeacher(parsed.teacherRaw),

package/dist/tt/types.d.ts

@@ -1,5 +1,7 @@
 import type { BlobAdapter, CacheAdapter } from "../common/cache.js";
-import type { Time, WeekRange, Teacher, EducationType } from "../common/types.js";
+import type { TimetableRepositoryAdapter, TimetableRepositorySnapshot } from "./domain/types.js";
+import type { TimetableRepository } from "./domain/repository.js";
+import type { TimeRange, WeekRange, Teacher, EducationLevel, AcademicPeriod, LocalDate } from "../common/types.js";
 export interface Faculty {
     id: number;
     name: string;
@@ -10,11 +12,11 @@ export interface Group {
     specialty?: string;
     profile?: string;
 }
-export interface Audience {
+export interface Room {
     id: number;
     name: string;
 }
-export interface AudienceInfo {
+export interface RoomInfo {
     name: string;
     /** Building letter/name, e.g. "Б". */
     building?: string;
@@ -39,7 +41,7 @@ export interface AudienceInfo {
 /** A date-specific substitution (room and/or teacher change). */
 export interface Substitution {
     /** The date this substitution applies to. */
-    date: Date;
+    date: LocalDate;
     /** New room, if changed. */
     room?: string;
     /** Whether the substitution moves the lesson online. */
@@ -50,34 +52,37 @@ export interface Substitution {
 /** Info about a lesson this teacher is substituting for another teacher. */
 export interface SubstituteForInfo {
     /** The date this substitute lesson takes place. */
-    date: Date;
+    date: LocalDate;
     /** The original teacher being replaced. */
-    originalTeacher: Teacher;
+    originalTeacher?: Teacher;
 }
 /** Info about a lesson transferred from another date/slot. */
 export interface TransferInfo {
     /** Date when this lesson takes place (target). */
-    targetDate: Date;
+    targetDate: LocalDate;
     /** Original date the lesson was moved from. */
-    fromDate: Date;
+    fromDate: LocalDate;
     /** Original slot number (пара). */
     fromSlot: number;
     /** Subject name (used to match the source entry). */
     subject: string;
 }
-export interface ScheduleEntry {
-    room: string;
+export interface ParsedLesson {
+    /** Missing means this source projection does not expose room information. */
+    room?: string | null;
     subject: string;
     type: string;
-    weeks: WeekRange;
-    teacher: Teacher;
+    /** Recurrence range; absent for concrete session lessons or unknown evidence. */
+    weeks?: WeekRange;
+    /** Missing means this source projection does not expose teacher information. */
+    teacher?: Teacher | null;
     /**
      * Group names for this lesson (e.g. `["КТ-42-25 (АихС)", "КТ-41-25"]`).
      * Parenthesized annotations that are part of the group name are preserved;
-     * service markers like "(N подгруппа)" are stripped and moved to {@link ScheduleEntry.subgroup}.
+     * service markers like "(N подгруппа)" are stripped and moved to {@link ParsedLesson.subgroup}.
      * Empty array if no groups are listed.
      */
-    groups: string[];
+    groups?: string[] | null;
     subgroup?: number;
     weekParity?: "even" | "odd";
     /** True when the lesson is explicitly marked as дистанционно / ДОТ. */
@@ -91,56 +96,23 @@ export interface ScheduleEntry {
     /** Whether this entry is marked as potentially changing (class="want"). */
     possibleChanges?: boolean;
 }
-export interface FullScheduleSlot {
-    number: number;
-    timeStart: Time;
-    timeEnd: Time;
-    entries: ScheduleEntry[];
+export interface ParsedScheduleBlock {
+    /** Portal ordinal claim. It is independent from the time claim. */
+    slotNumber?: number;
+    /** Missing when the source does not expose a trustworthy time range. */
+    time?: TimeRange;
+    lessons: ParsedLesson[];
 }
-export interface FullScheduleDay {
+export interface ParsedScheduleDay {
     weekday: string;
-    date?: Date;
+    date?: LocalDate;
     /** True when portal marks this weekday as a self-study day. */
     isSelfStudyDay?: boolean;
-    slots: FullScheduleSlot[];
-}
-export interface LessonTimeSlot {
-    number: number;
-    start: Time;
-    end: Time;
-}
-export interface LessonTime {
-    date: Date;
-    hours: number;
-    minutes: number;
-}
-export interface Lesson {
-    number: number;
-    start: LessonTime;
-    end: LessonTime;
-    subject: string;
-    type: string;
-    room: string;
-    teacher: Teacher;
-    /** Group names for this lesson. See {@link ScheduleEntry.groups}. */
-    groups: string[];
-    weeks: WeekRange;
-    subgroup?: number;
-    weekParity?: "even" | "odd";
-    /** True when the lesson is explicitly marked as дистанционно / ДОТ. */
-    isDistance?: boolean;
-    /** Matched webinar metadata, if attached by `attachWebinarsToLessons`. */
-    webinar?: Webinar;
-    /** If a substitution was applied, the original room. */
-    originalRoom?: string;
-    /** If a substitution was applied, the original teacher. */
-    originalTeacher?: Teacher;
-    /** Transfer info if this lesson was moved from another date/slot. */
-    transfer?: TransferInfo;
-    /** If this lesson is a substitute (замена вместо), the original teacher. */
-    substituteFor?: SubstituteForInfo;
-    /** Whether this lesson is marked as potentially changing. */
-    possibleChanges?: boolean;
+    blocks: ParsedScheduleBlock[];
+}
+export interface StandardScheduleBlock {
+    slotNumber: number;
+    time: TimeRange;
 }
 /** Teacher info from the schedule page header. */
 export interface TeacherInfo {
@@ -162,10 +134,9 @@ export interface Webinar {
     idType: number;
     /** True for "Вебинары по расписанию"; false for external webinars. */
     scheduled: boolean;
-    date?: Date;
+    scheduledDate?: LocalDate;
     slotNumber?: number;
-    timeStart: Time;
-    timeEnd: Time;
+    time: TimeRange;
     subject: string;
     type: string;
     teacher: Teacher;
@@ -180,18 +151,32 @@ export interface CacheConfig {
     schedule?: number;
     faculties?: number;
     groups?: number;
-    audiences?: number;
-    audienceNames?: number;
+    rooms?: number;
+    roomNames?: number;
     teachers?: number;
     teacherInfo?: number;
     teacherPhotos?: number;
-    audienceInfo?: number;
-    audienceImages?: number;
+    roomInfo?: number;
+    roomImages?: number;
     webinars?: number;
 }
-export interface TtClientOptions {
-    educationType?: EducationType;
+export interface TimetableClientOptions {
+    educationLevel?: EducationLevel;
     cache?: number | CacheConfig;
     cacheAdapter?: CacheAdapter;
     blobAdapter?: BlobAdapter;
+    /** Existing canonical repository, useful for dependency injection/browser handoff. */
+    repository?: TimetableRepository;
+    /** Persistent canonical identity storage. Independent from the TTL cache. */
+    repositoryAdapter?: TimetableRepositoryAdapter;
+}
+export interface GetScheduleOptions {
+    periods?: readonly AcademicPeriod[];
+}
+export type EntityResolutionStrategy = "cache-only" | "search";
+export interface DirectoryPreloadOptions {
+    teachers?: boolean;
+    rooms?: boolean;
+    facultyIds?: number[];
 }
+export type { TimetableRepositorySnapshot };

package/dist/tt/utils/date.d.ts

@@ -1,5 +1,9 @@
+import type { LocalDate } from "../../common/types.js";
 export declare function getWeekdayName(weekday: number): string;
 /** Monday of the week containing `date` (at 00:00 local time). */
 export declare function getMonday(date: Date): Date;
 /** True if `a` and `b` fall on the same calendar day (local time). */
 export declare function isSameDay(a: Date, b: Date): boolean;
+export declare function formatLocalDate(date: Date): LocalDate;
+export declare function isLocalDate(value: string): value is LocalDate;
+export declare function parseLocalDate(value: LocalDate): Date;

package/dist/tt/utils/date.js

@@ -8,10 +8,15 @@ const WEEKDAY_NAMES = [
     "Суббота",
 ];
 export function getWeekdayName(weekday) {
-    return WEEKDAY_NAMES[weekday] ?? "";
+    if (!Number.isInteger(weekday) || weekday < 0 || weekday > 6) {
+        throw new RangeError("Weekday must be an integer from 0 to 6");
+    }
+    return WEEKDAY_NAMES[weekday];
 }
 /** Monday of the week containing `date` (at 00:00 local time). */
 export function getMonday(date) {
+    if (!Number.isFinite(date.getTime()))
+        throw new RangeError("Invalid date");
     const d = new Date(date);
     const day = d.getDay();
     const diff = day === 0 ? -6 : 1 - day;
@@ -25,3 +30,27 @@ export function isSameDay(a, b) {
         a.getMonth() === b.getMonth() &&
         a.getDate() === b.getDate());
 }
+export function formatLocalDate(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+}
+export function isLocalDate(value) {
+    const match = value.match(/^(\d{4})-(\d{2})-(\d{2})$/u);
+    if (!match)
+        return false;
+    const year = Number(match[1]);
+    const month = Number(match[2]);
+    const day = Number(match[3]);
+    const date = new Date(year, month - 1, day);
+    return date.getFullYear() === year &&
+        date.getMonth() === month - 1 &&
+        date.getDate() === day;
+}
+export function parseLocalDate(value) {
+    if (!isLocalDate(value))
+        throw new RangeError(`Invalid local date: ${value}`);
+    const [year, month, day] = value.split("-").map(Number);
+    return new Date(year, month - 1, day);
+}

package/dist/tt/utils/index.d.ts

@@ -1,7 +1,6 @@
-export { getMonday, getWeekdayName, isSameDay } from "./date.js";
+export { formatLocalDate, getMonday, getWeekdayName, isSameDay, isLocalDate, parseLocalDate, } from "./date.js";
 export { getAdjacentSemester, getCurrentPeriod, isSessionPeriod, } from "./period.js";
 export { getSemesterStart, getSemesterWeeks, getWeekNumber, } from "./semester.js";
-export { getLessonNumber, getTimeSlots } from "./time-slots.js";
-export { attachWebinarsToLessons, collectTransfers, filterSlots, matchWebinarToLesson, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
+export { getStandardScheduleBlocks } from "./time-slots.js";
 export { getCompensatingWorkDays, getEffectiveHolidays, getHolidayTransfers, isHoliday, RUSSIAN_HOLIDAYS, } from "./holidays.js";
 export type { Holiday, HolidayTransfer } from "./holidays.js";

package/dist/tt/utils/index.js

@@ -1,6 +1,5 @@
-export { getMonday, getWeekdayName, isSameDay } from "./date.js";
+export { formatLocalDate, getMonday, getWeekdayName, isSameDay, isLocalDate, parseLocalDate, } from "./date.js";
 export { getAdjacentSemester, getCurrentPeriod, isSessionPeriod, } from "./period.js";
 export { getSemesterStart, getSemesterWeeks, getWeekNumber, } from "./semester.js";
-export { getLessonNumber, getTimeSlots } from "./time-slots.js";
-export { attachWebinarsToLessons, collectTransfers, filterSlots, matchWebinarToLesson, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
+export { getStandardScheduleBlocks } from "./time-slots.js";
 export { getCompensatingWorkDays, getEffectiveHolidays, getHolidayTransfers, isHoliday, RUSSIAN_HOLIDAYS, } from "./holidays.js";

package/dist/tt/utils/period.d.ts

@@ -1,6 +1,6 @@
-import { Period } from "../../common/types.js";
+import { AcademicPeriod } from "../../common/types.js";
 export declare function getCurrentPeriod(opts?: {
     date?: Date;
-}): Period;
-export declare function isSessionPeriod(period: Period): boolean;
-export declare function getAdjacentSemester(session: Period): Period;
+}): AcademicPeriod;
+export declare function isSessionPeriod(period: AcademicPeriod): boolean;
+export declare function getAdjacentSemester(session: AcademicPeriod): AcademicPeriod;

package/dist/tt/utils/period.js

@@ -1,24 +1,25 @@
+import { AcademicPeriod } from "../../common/types.js";
 export function getCurrentPeriod(opts) {
     const date = opts?.date ?? new Date();
     const month = date.getMonth();
     const day = date.getDate();
     // Dec 25+ and Jan -> Winter session (зимняя сессия)
     if (month === 0 || (month === 11 && day >= 25))
-        return 2 /* Period.WinterSession */;
+        return AcademicPeriod.WinterSession;
     // Feb-May -> Spring semester (весенний семестр)
     if (month >= 1 && month <= 4)
-        return 3 /* Period.SpringSemester */;
+        return AcademicPeriod.SpringSemester;
     // Jun-Aug -> Summer session (летняя сессия)
     if (month >= 5 && month <= 7)
-        return 4 /* Period.SummerSession */;
+        return AcademicPeriod.SummerSession;
     // Sep - Dec 24 -> Fall semester (осенний семестр)
-    return 1 /* Period.FallSemester */;
+    return AcademicPeriod.FallSemester;
 }
 export function isSessionPeriod(period) {
-    return period === 2 /* Period.WinterSession */ || period === 4 /* Period.SummerSession */;
+    return period === AcademicPeriod.WinterSession || period === AcademicPeriod.SummerSession;
 }
 export function getAdjacentSemester(session) {
-    return session === 2 /* Period.WinterSession */
-        ? 1 /* Period.FallSemester */
-        : 3 /* Period.SpringSemester */;
+    return session === AcademicPeriod.WinterSession
+        ? AcademicPeriod.FallSemester
+        : AcademicPeriod.SpringSemester;
 }

package/dist/tt/utils/semester.d.ts

@@ -1,4 +1,4 @@
-import { Period } from "../../common/types.js";
+import { AcademicPeriod } from "../../common/types.js";
 import type { SemesterWeek } from "../types.js";
 /**
  * Start date of a semester.
@@ -8,7 +8,7 @@ import type { SemesterWeek } from "../types.js";
  * academic year instead of the calendar year.
  */
 export declare function getSemesterStart(opts: {
-    period: Period;
+    period: AcademicPeriod;
     year?: number;
     date?: Date;
 }): Date;
@@ -17,14 +17,14 @@ export declare function getSemesterStart(opts: {
  * Week 1 is the calendar week containing the semester start date.
  */
 export declare function getSemesterWeeks(opts: {
-    period: Period;
+    period: AcademicPeriod;
     year?: number;
     date?: Date;
     weekCount?: number;
 }): SemesterWeek[];
 /** Current week number within a semester. */
 export declare function getWeekNumber(opts: {
-    period: Period;
+    period: AcademicPeriod;
     year?: number;
     date?: Date;
 }): number;

package/dist/tt/utils/semester.js

@@ -1,4 +1,15 @@
+import { AcademicPeriod } from "../../common/types.js";
 import { getMonday } from "./date.js";
+function assertSemesterPeriod(period) {
+    if (period !== AcademicPeriod.FallSemester &&
+        period !== AcademicPeriod.SpringSemester) {
+        throw new RangeError("Academic period must be a semester");
+    }
+}
+function calendarDayNumber(date) {
+    return Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()) /
+        (24 * 60 * 60 * 1000);
+}
 function getAcademicYearStartYear(date) {
     const year = date.getFullYear();
     const month = date.getMonth();
@@ -6,11 +17,17 @@ function getAcademicYearStartYear(date) {
     return month >= 8 ? year : year - 1;
 }
 function resolveSemesterYear(opts) {
-    if (opts.year != null)
+    assertSemesterPeriod(opts.period);
+    if (opts.year != null) {
+        if (!Number.isInteger(opts.year))
+            throw new RangeError("Invalid semester year");
         return opts.year;
+    }
     const baseDate = opts.date ?? new Date();
+    if (!Number.isFinite(baseDate.getTime()))
+        throw new RangeError("Invalid date");
     const academicYearStart = getAcademicYearStartYear(baseDate);
-    return opts.period === 1 /* Period.FallSemester */
+    return opts.period === AcademicPeriod.FallSemester
         ? academicYearStart
         : academicYearStart + 1;
 }
@@ -23,7 +40,7 @@ function resolveSemesterYear(opts) {
  */
 export function getSemesterStart(opts) {
     const year = resolveSemesterYear(opts);
-    if (opts.period === 1 /* Period.FallSemester */) {
+    if (opts.period === AcademicPeriod.FallSemester) {
         return new Date(year, 8, 1); // September 1
     }
     // Spring: first Monday of February
@@ -40,6 +57,9 @@ export function getSemesterStart(opts) {
  */
 export function getSemesterWeeks(opts) {
     const weekCount = opts.weekCount ?? 17;
+    if (!Number.isInteger(weekCount) || weekCount < 1) {
+        throw new RangeError("Week count must be a positive integer");
+    }
     const semesterStart = getSemesterStart(opts);
     const startMonday = getMonday(semesterStart);
     const weeks = [];
@@ -59,6 +79,6 @@ export function getWeekNumber(opts) {
     const semesterStart = getSemesterStart({ ...opts, date });
     const startMonday = getMonday(semesterStart);
     const targetMonday = getMonday(date);
-    const diff = targetMonday.getTime() - startMonday.getTime();
-    return Math.floor(diff / (7 * 24 * 60 * 60 * 1000)) + 1;
+    const diff = calendarDayNumber(targetMonday) - calendarDayNumber(startMonday);
+    return Math.floor(diff / 7) + 1;
 }

package/dist/tt/utils/time-slots.d.ts

@@ -1,5 +1,3 @@
-import { EducationType } from "../../common/types.js";
-import type { Time } from "../../common/types.js";
-import type { LessonTimeSlot } from "../types.js";
-export declare function getTimeSlots(educationType: EducationType): LessonTimeSlot[];
-export declare function getLessonNumber(time: Time, educationType: EducationType): number;
+import { EducationLevel } from "../../common/types.js";
+import type { StandardScheduleBlock } from "../types.js";
+export declare function getStandardScheduleBlocks(educationLevel: EducationLevel): StandardScheduleBlock[];

package/dist/tt/utils/time-slots.js

@@ -1,41 +1,26 @@
+import { EducationLevel } from "../../common/types.js";
 const VO_TIME_SLOTS = [
-    { number: 1, start: { hours: 8, minutes: 20 }, end: { hours: 9, minutes: 40 } },
-    { number: 2, start: { hours: 9, minutes: 50 }, end: { hours: 11, minutes: 10 } },
-    { number: 3, start: { hours: 11, minutes: 40 }, end: { hours: 13, minutes: 0 } },
-    { number: 4, start: { hours: 13, minutes: 30 }, end: { hours: 14, minutes: 50 } },
-    { number: 5, start: { hours: 15, minutes: 0 }, end: { hours: 16, minutes: 20 } },
-    { number: 6, start: { hours: 16, minutes: 40 }, end: { hours: 18, minutes: 0 } },
-    { number: 7, start: { hours: 18, minutes: 10 }, end: { hours: 19, minutes: 30 } },
-    { number: 8, start: { hours: 19, minutes: 40 }, end: { hours: 21, minutes: 0 } },
+    { slotNumber: 1, time: { start: { hours: 8, minutes: 20 }, end: { hours: 9, minutes: 40 } } },
+    { slotNumber: 2, time: { start: { hours: 9, minutes: 50 }, end: { hours: 11, minutes: 10 } } },
+    { slotNumber: 3, time: { start: { hours: 11, minutes: 40 }, end: { hours: 13, minutes: 0 } } },
+    { slotNumber: 4, time: { start: { hours: 13, minutes: 30 }, end: { hours: 14, minutes: 50 } } },
+    { slotNumber: 5, time: { start: { hours: 15, minutes: 0 }, end: { hours: 16, minutes: 20 } } },
+    { slotNumber: 6, time: { start: { hours: 16, minutes: 40 }, end: { hours: 18, minutes: 0 } } },
+    { slotNumber: 7, time: { start: { hours: 18, minutes: 10 }, end: { hours: 19, minutes: 30 } } },
+    { slotNumber: 8, time: { start: { hours: 19, minutes: 40 }, end: { hours: 21, minutes: 0 } } },
 ];
 const SPO_TIME_SLOTS = [
-    { number: 1, start: { hours: 8, minutes: 10 }, end: { hours: 9, minutes: 40 } },
-    { number: 2, start: { hours: 9, minutes: 55 }, end: { hours: 11, minutes: 25 } },
-    { number: 3, start: { hours: 11, minutes: 55 }, end: { hours: 13, minutes: 25 } },
-    { number: 4, start: { hours: 13, minutes: 40 }, end: { hours: 15, minutes: 10 } },
-    { number: 5, start: { hours: 15, minutes: 25 }, end: { hours: 16, minutes: 55 } },
-    { number: 6, start: { hours: 17, minutes: 10 }, end: { hours: 18, minutes: 40 } },
-    { number: 7, start: { hours: 18, minutes: 55 }, end: { hours: 20, minutes: 25 } },
+    { slotNumber: 1, time: { start: { hours: 8, minutes: 10 }, end: { hours: 9, minutes: 40 } } },
+    { slotNumber: 2, time: { start: { hours: 9, minutes: 55 }, end: { hours: 11, minutes: 25 } } },
+    { slotNumber: 3, time: { start: { hours: 11, minutes: 55 }, end: { hours: 13, minutes: 25 } } },
+    { slotNumber: 4, time: { start: { hours: 13, minutes: 40 }, end: { hours: 15, minutes: 10 } } },
+    { slotNumber: 5, time: { start: { hours: 15, minutes: 25 }, end: { hours: 16, minutes: 55 } } },
+    { slotNumber: 6, time: { start: { hours: 17, minutes: 10 }, end: { hours: 18, minutes: 40 } } },
+    { slotNumber: 7, time: { start: { hours: 18, minutes: 55 }, end: { hours: 20, minutes: 25 } } },
 ];
-export function getTimeSlots(educationType) {
-    return educationType === 2 /* EducationType.VocationalEducation */
+export function getStandardScheduleBlocks(educationLevel) {
+    const blocks = educationLevel === EducationLevel.VocationalEducation
         ? SPO_TIME_SLOTS
         : VO_TIME_SLOTS;
-}
-function timeToMinutes(t) {
-    return t.hours * 60 + t.minutes;
-}
-export function getLessonNumber(time, educationType) {
-    const slots = getTimeSlots(educationType);
-    const target = timeToMinutes(time);
-    let closest = slots[0];
-    let minDiff = Math.abs(timeToMinutes(closest.start) - target);
-    for (let i = 1; i < slots.length; i++) {
-        const diff = Math.abs(timeToMinutes(slots[i].start) - target);
-        if (diff < minDiff) {
-            minDiff = diff;
-            closest = slots[i];
-        }
-    }
-    return closest.number;
+    return structuredClone(blocks);
 }

package/dist/tt/webinars.d.ts

@@ -0,0 +1,7 @@
+import type { LessonOccurrence } from "./domain/types.js";
+import type { Webinar } from "./types.js";
+export type LessonWithWebinar = LessonOccurrence & {
+    webinar?: Webinar;
+};
+export declare function findWebinar(lesson: LessonOccurrence, webinars: Webinar[]): Webinar | undefined;
+export declare function attachWebinars(lessons: LessonOccurrence[], webinars: Webinar[]): LessonWithWebinar[];

package/dist/tt/webinars.js

@@ -0,0 +1,38 @@
+function normalize(value) {
+    return value
+        .toLocaleLowerCase("ru-RU")
+        .replace(/ё/gu, "е")
+        .replace(/\s+/gu, " ")
+        .trim();
+}
+export function findWebinar(lesson, webinars) {
+    return webinars.find((webinar) => {
+        if (!webinar.scheduled)
+            return false;
+        if (webinar.scheduledDate &&
+            webinar.scheduledDate !== lesson.scheduledDate)
+            return false;
+        if (webinar.slotNumber != null &&
+            webinar.slotNumber !== lesson.slotNumber) {
+            return false;
+        }
+        if (!lesson.time ||
+            webinar.time.start.hours !== lesson.time.start.hours ||
+            webinar.time.start.minutes !== lesson.time.start.minutes ||
+            webinar.time.end.hours !== lesson.time.end.hours ||
+            webinar.time.end.minutes !== lesson.time.end.minutes) {
+            return false;
+        }
+        if (normalize(webinar.subject) !== normalize(lesson.subject))
+            return false;
+        if (webinar.type && lesson.type && webinar.type !== lesson.type)
+            return false;
+        return true;
+    });
+}
+export function attachWebinars(lessons, webinars) {
+    return lessons.map((lesson) => {
+        const webinar = findWebinar(lesson, webinars);
+        return webinar ? { ...lesson, webinar } : lesson;
+    });
+}

package/docs/fixture-review.md

@@ -0,0 +1,56 @@
+# Журнал ручной проверки полных фикстур
+
+Дата проверки: 1 сентября 2026 года.
+
+Каждая строка каждого expected JSON лично сопоставлена с исходным HTML. При
+проверке учитывались метаданные источника, позиция записи, предмет, тип, день,
+слот, время, недели, чередование, аудитория, преподаватель и его реквизиты,
+группы, подгруппа, ДОТ, замены и переносы. Генератор expected-файлов и отдельный
+DOM-аудитор не использовались.
+
+| Эталон | Занятий | Результат |
+|---|---:|---|
+| group-10042-period-1.json | 38 | проверен |
+| group-10209-period-1.json | 22 | проверен |
+| group-10307-period-1.json | 31 | проверен |
+| group-10383-period-1.json | 27 | проверен |
+| group-10403-period-1.json | 5 | проверен |
+| group-10428-period-1.json | 30 | проверен |
+| group-10443-period-1.json | 19 | проверен |
+| group-10462-period-1.json | 26 | проверен |
+| group-10468-period-1.json | 20 | проверен |
+| group-10481-period-1.json | 4 | проверен |
+| group-10483-period-1.json | 4 | проверен |
+| group-10488-period-1.json | 4 | проверен |
+| group-7698-period-1.json | 21 | проверен |
+| group-8035-period-1.json | 9 | проверен |
+| group-8107-period-1.json | 21 | проверен |
+| group-8203-period-1.json | 26 | проверен |
+| group-8219-period-1.json | 22 | проверен |
+| group-8231-period-1.json | 49 | проверен |
+| group-8499-period-1.json | 28 | проверен |
+| group-8827-period-1.json | 65 | проверен, исправлено `к.иск.` |
+| group-8844-period-1.json | 25 | проверен |
+| group-8912-period-1.json | 42 | проверен |
+| group-8917-period-1.json | 43 | проверен |
+| group-8919-period-1.json | 59 | проверен |
+| group-9075-period-1.json | 40 | проверен |
+| group-9332-period-1.json | 24 | проверен |
+| group-9347-period-1.json | 22 | проверен |
+| group-9438-period-1.json | 19 | проверен |
+| group-9491-period-1.json | 16 | проверен |
+| group-9520-period-1.json | 26 | проверен |
+| group-9588-period-1.json | 8 | проверен |
+| group-9698-period-1.json | 37 | проверен, включая перенос |
+| group-9719-period-1.json | 44 | проверен |
+| group-9843-period-1.json | 24 | проверен |
+| teacher-1317-period-1.json | 7 | проверен, восстановлена ученая степень |
+| teacher-1907-period-1.json | 8 | проверен |
+| teacher-2317-period-1.json | 10 | проверен |
+| teacher-543-period-1.json | 39 | проверен, восстановлена ученая степень |
+| room-1438-period-1.json | 75 | проверен |
+| room-803-period-1.json | 48 | проверен, включая два переноса |
+| room-811-period-1.json | 54 | проверен |
+| room-814-period-1.json | 43 | проверен, исправлено ложное ДОТ у Федотовой |
+
+Итого: 42 файла, 1184 занятия.

package/docs/testing.md

@@ -0,0 +1,23 @@
+# Проверка расписания v5
+
+Эталонные JSON поддерживаются и изменяются только вручную. Генератора эталонов
+в репозитории нет. Все 42 полных JSON-эталона (1184 занятия) вручную сверены с
+соответствующими HTML-страницами. Проверены владелец, учебный год, период,
+позиция строки, предмет, тип, день, слот, фактическое время, недели,
+чередование, аудитория, преподаватель, группы, подгруппа, ДОТ, замены и
+переносы. Журнал проверки: [`fixture-review.md`](fixture-review.md).
+
+Для каждой страницы тест заново получает канонический результат и целиком
+сравнивает его с зафиксированным JSON. Детерминированный генератор ID в тесте
+нужен только для стабильных идентификаторов; он не создает и не изменяет
+эталоны. Дополнительно весь корпус проверяет объединение общих пар между
+страницами групп, преподавателей и аудиторий.
+
+Точечные примеры проверяют семестр, сессию, экзамены, консультации, подгруппы,
+ДОТ, замены, преподавателя «вместо», переносы и отсутствие данных. Доменные
+тесты проверяют ID, неоднозначность, объединение проекций, применение изменений
+и календарное раскрытие. `pnpm test:coverage` требует для ядра расписания не
+меньше 95% строк, 94% функций и 80% ветвей.
+
+Live-тест сравнивает парсер с текущими страницами портала, но не заменяет
+зафиксированные HTML и ручные эталоны.