chuvsu-js 4.1.5 → 5.0.0

package/dist/tt/parse/audience.js

@@ -1,10 +1,10 @@
-import { parseHtml, parseTeacher, parseWeekParity, parseWeeks, text, } from "../../common/parse.js";
-import { parseSemesterScheduleWith } from "./full-schedule.js";
+import { parseHtml, parseTeacher, parseTime, parseWeekParity, parseWeeks, text, } from "../../common/parse.js";
+import { parseSemesterScheduleWith, parseSessionScheduleWith, } from "./full-schedule.js";
 import { parseGroupsString } from "./groups.js";
 import { parseSubstituteForDiv, parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
-import { LESSON_TYPE_GLOBAL_RE, LESSON_TYPE_RE, SUBGROUP_ANNOTATION_RE, SUBGROUP_RE, WEEKS_GLOBAL_RE, WEEKS_RE, } from "./patterns.js";
-const DISTANCE_RE = /дистанционно|ДОТ/i;
-export function parseAudienceInfo(html) {
+import { LESSON_TYPE_GLOBAL_RE, LESSON_TYPE_RE, FLEXIBLE_LESSON_TYPE_RE_I, SUBGROUP_ANNOTATION_RE, SUBGROUP_RE, WEEKS_GLOBAL_RE, WEEKS_RE, } from "./patterns.js";
+import { containsGroupCode, hasDistanceMarker, linesAfterSubject, stripDistanceMarker, } from "./entry-parts.js";
+export function parseRoomInfo(html) {
     const doc = parseHtml(html);
     // Name: <span class="htext"><nobr>Аудитория <span style="color: blue;">NAME</span></nobr></span>
     const nameEl = doc.querySelector('.htext span[style*="color: blue"]');
@@ -67,7 +67,7 @@ export function parseAudienceInfo(html) {
         floorplanRect,
     };
 }
-function parseAudienceSemesterEntry(el) {
+function parseRoomSemesterEntry(el) {
     const td = el.querySelector("td") ?? el;
     const fullHtml = td.innerHTML ?? "";
     const plainText = text(td);
@@ -111,43 +111,67 @@ function parseAudienceSemesterEntry(el) {
     const weeksMatch = cleanText.match(WEEKS_RE);
     const subgroupMatch = cleanText.match(SUBGROUP_RE);
     const weekParity = parseWeekParity(cleanHtml);
-    // Audience entries layout:
-    //   <span blue>SUBJ</span> (TYPE) (WEEKS) <br>TEACHER<br>GROUPS
-    // Teacher is the first line after </span>...<br>, groups is the next line.
-    const afterSubject = cleanHtml.split(/<\/span>/i).slice(1).join("</span>");
-    const parts = afterSubject
-        .split(/<br\s*\/?>/i)
-        .map((p) => p.replace(/<[^>]*>/g, "").trim())
-        .filter((p) => p.length > 0);
-    // parts[0] = " (лк) (1 - 16 нед.) " — trailing metadata; drop tokens that
-    // look like (type)/(weeks)/(N подгруппа). First real text line = teacher.
-    const textLines = [];
-    for (const p of parts) {
-        const cleaned = p
-            .replace(LESSON_TYPE_GLOBAL_RE, "")
-            .replace(WEEKS_GLOBAL_RE, "")
-            .replace(SUBGROUP_ANNOTATION_RE, "")
-            .trim();
-        if (cleaned)
-            textLines.push(cleaned);
-    }
-    const teacherLine = textLines[0] ?? "";
-    const groupsLine = textLines.slice(1).join(" ").trim();
+    // Audience entries: subject line, then teacher line, then group line(s).
+    const parts = linesAfterSubject(cleanHtml, subject);
+    const teacherLine = stripDistanceMarker(parts.find((line) => !containsGroupCode(stripDistanceMarker(line))) ?? "");
+    const groupsLine = parts
+        .filter((line) => containsGroupCode(stripDistanceMarker(line)))
+        .map(stripDistanceMarker)
+        .map((line) => line
+        .replace(LESSON_TYPE_GLOBAL_RE, "")
+        .replace(WEEKS_GLOBAL_RE, "")
+        .replace(SUBGROUP_ANNOTATION_RE, "")
+        .trim())
+        .filter(Boolean)
+        .join(" ");
+    const groups = parseGroupsString(groupsLine);
     return {
-        room: "",
         subject,
         type: typeMatch?.[1] ?? "",
         weeks: parseWeeks(weeksMatch?.[1] ?? ""),
-        teacher: parseTeacher(teacherLine),
-        groups: parseGroupsString(groupsLine),
+        teacher: teacherLine ? parseTeacher(teacherLine) : undefined,
+        groups: groups.length > 0 ? groups : undefined,
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
         weekParity,
-        isDistance: DISTANCE_RE.test(cleanText),
+        isDistance: hasDistanceMarker(cleanText),
         substitutions: substitutions.length > 0 ? substitutions : undefined,
         possibleChanges,
     };
 }
-export function parseAudienceFullSchedule(html) {
+export function parseRoomSchedule(html) {
     const doc = parseHtml(html);
-    return parseSemesterScheduleWith(doc, parseAudienceSemesterEntry);
+    if (doc.querySelector('td[id^="trd2"]')) {
+        return parseSessionScheduleWith(doc, parseRoomSessionEntry);
+    }
+    return parseSemesterScheduleWith(doc, parseRoomSemesterEntry);
+}
+function parseRoomSessionEntry(td) {
+    const fullHtml = td.innerHTML ?? "";
+    const plainText = text(td);
+    const subjectEl = td.querySelector('span[style*="color: blue"]');
+    const subject = subjectEl ? text(subjectEl) : "";
+    if (!plainText || !subject)
+        return null;
+    const timeMatch = fullHtml.match(/<br\s*\/?>\s*(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
+    if (!timeMatch)
+        return null;
+    const typeMatch = plainText.match(FLEXIBLE_LESSON_TYPE_RE_I);
+    const parts = linesAfterSubject(fullHtml, subject);
+    const teacherLine = parts.find((part) => !/^\d{2}:\d{2}\s*-\s*\d{2}:\d{2}$/.test(part) &&
+        !containsGroupCode(stripDistanceMarker(part)));
+    const groupsLine = parts.find((part) => containsGroupCode(stripDistanceMarker(part)));
+    const groups = parseGroupsString(stripDistanceMarker(groupsLine ?? ""));
+    const subgroupMatch = plainText.match(SUBGROUP_RE);
+    return {
+        lesson: {
+            subject,
+            type: typeMatch?.[1].replace(/\.$/, "").toLowerCase() ?? "",
+            teacher: teacherLine ? parseTeacher(stripDistanceMarker(teacherLine)) : undefined,
+            groups: groups.length > 0 ? groups : undefined,
+            subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            isDistance: hasDistanceMarker(plainText),
+            possibleChanges: (td.getAttribute("class") ?? "").includes("want") || undefined,
+        },
+        time: { start: parseTime(timeMatch[1]), end: parseTime(timeMatch[2]) },
+    };
 }

package/dist/tt/parse/entry-parts.d.ts

@@ -0,0 +1,8 @@
+export declare function entryHtmlLines(html: string): string[];
+export declare function entryTextLines(html: string): string[];
+export declare function stripHtml(html: string): string;
+export declare function hasDistanceMarker(value: string): boolean;
+export declare function linesAfterSubject(html: string, subject: string): string[];
+export declare function parseEntryRoom(html: string, subject: string): string;
+export declare function stripDistanceMarker(value: string): string;
+export declare function containsGroupCode(value: string): boolean;

package/dist/tt/parse/entry-parts.js

@@ -0,0 +1,52 @@
+const BR_RE = /<br\s*\/?>/i;
+const TAG_RE = /<[^>]*>/g;
+const DISTANCE_RE = /(?:^|[^\p{L}\p{N}])(?:дистанционно|ДОТ)(?=$|[^\p{L}\p{N}])/iu;
+const GROUP_TOKEN_RE = /^[A-ZА-ЯЁ]{1,}(?:-[A-ZА-ЯЁa-zа-яё0-9]+)+$/u;
+export function entryHtmlLines(html) {
+    return html.split(BR_RE).map((line) => line.trim());
+}
+export function entryTextLines(html) {
+    return entryHtmlLines(html)
+        .map(stripHtml)
+        .filter((line) => line.length > 0);
+}
+export function stripHtml(html) {
+    return html.replace(TAG_RE, " ").replace(/\s+/g, " ").trim();
+}
+export function hasDistanceMarker(value) {
+    return DISTANCE_RE.test(value);
+}
+export function linesAfterSubject(html, subject) {
+    const lines = entryTextLines(html);
+    const index = lines.findIndex((line) => line.includes(subject));
+    return index < 0 ? [] : lines.slice(index + 1);
+}
+export function parseEntryRoom(html, subject) {
+    const lines = entryHtmlLines(html);
+    const line = lines.find((part) => stripHtml(part).includes(subject));
+    if (!line)
+        return "";
+    const lineText = stripHtml(line);
+    const subjectIndex = lineText.indexOf(subject);
+    if (subjectIndex < 0)
+        return "";
+    const beforeSubject = lineText
+        .slice(0, subjectIndex)
+        .replace(/^\*+\s*/, "")
+        .trim();
+    if (hasDistanceMarker(stripHtml(html))) {
+        return "Дистанционно (ДОТ)";
+    }
+    if (!beforeSubject)
+        return "";
+    return beforeSubject;
+}
+export function stripDistanceMarker(value) {
+    return value
+        .replace(/\(\s*ДОТ\s*\)/giu, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+}
+export function containsGroupCode(value) {
+    return value.split(/\s+/).some((token) => GROUP_TOKEN_RE.test(token));
+}

package/dist/tt/parse/full-schedule.d.ts

@@ -1,4 +1,9 @@
-import { EducationType } from "../../common/types.js";
-import type { FullScheduleDay, ScheduleEntry } from "../types.js";
-export declare function parseFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
-export declare function parseSemesterScheduleWith(doc: Document, entryParser: (el: Element) => ScheduleEntry | null): FullScheduleDay[];
+import type { ParsedScheduleDay, ParsedScheduleBlock, ParsedLesson } from "../types.js";
+export declare function parseGroupSchedule(html: string): ParsedScheduleDay[];
+export declare function parseSemesterScheduleWith(doc: Document, entryParser: (el: Element) => ParsedLesson | null): ParsedScheduleDay[];
+interface ParsedSessionEntry {
+    lesson: ParsedLesson;
+    time: NonNullable<ParsedScheduleBlock["time"]>;
+}
+export declare function parseSessionScheduleWith(doc: Document, entryParser: (element: Element) => ParsedSessionEntry | null): ParsedScheduleDay[];
+export {};

package/dist/tt/parse/full-schedule.js

@@ -1,14 +1,12 @@
 import { parseHtml, parseTeacher, parseTime, parseWeekParity, parseWeeks, text, } from "../../common/parse.js";
-import { getLessonNumber } from "../utils/index.js";
 import { parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
 import { FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
-const DISTANCE_RE = /дистанционно|ДОТ/i;
-export function parseFullSchedule(html, educationType) {
+import { hasDistanceMarker, containsGroupCode, linesAfterSubject, parseEntryRoom, stripDistanceMarker, } from "./entry-parts.js";
+export function parseGroupSchedule(html) {
     const doc = parseHtml(html);
-    const edType = educationType ?? 1 /* EducationType.HigherEducation */;
     // Session layout has date-based cells with ids like "trd20251224"
     if (doc.querySelector('td[id^="trd2"]')) {
-        return parseSessionSchedule(doc, edType);
+        return parseSessionSchedule(doc);
     }
     return parseSemesterSchedule(doc);
 }
@@ -23,13 +21,20 @@ export function parseSemesterScheduleWith(doc, entryParser) {
         if (style.includes("lightgray") && cls.includes("trfd")) {
             const dayName = text(row.querySelector("td"));
             if (dayName) {
-                currentDay = { weekday: dayName, slots: [] };
+                currentDay = { weekday: dayName, blocks: [] };
                 days.push(currentDay);
             }
             continue;
         }
         if (!currentDay)
             continue;
+        const selfStudyMarker = row.querySelector('span[style*="color: blue"]');
+        if (selfStudyMarker &&
+            /^День самостоятельной работы$/i.test(text(selfStudyMarker)) &&
+            selfStudyMarker.closest("tr") === row) {
+            currentDay.isSelfStudyDay = true;
+            continue;
+        }
         const timeCell = row.querySelector("td.trf");
         const dataCell = row.querySelector("td.trdata:not(.trf)");
         if (!timeCell || !dataCell)
@@ -42,17 +47,18 @@ export function parseSemesterScheduleWith(doc, entryParser) {
         const timeMatch = timeText.match(/\((\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})\)/);
         if (!numberMatch)
             continue;
-        const entries = [];
+        const lessons = [];
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
             const entry = entryParser(entryRow);
             if (entry)
-                entries.push(entry);
+                lessons.push(entry);
         }
-        currentDay.slots.push({
-            number: parseInt(numberMatch[1]),
-            timeStart: parseTime(timeMatch?.[1] ?? "00:00"),
-            timeEnd: parseTime(timeMatch?.[2] ?? "00:00"),
-            entries,
+        currentDay.blocks.push({
+            slotNumber: parseInt(numberMatch[1]),
+            time: timeMatch
+                ? { start: parseTime(timeMatch[1]), end: parseTime(timeMatch[2]) }
+                : undefined,
+            lessons,
         });
     }
     return days;
@@ -98,26 +104,27 @@ function parseSemesterEntry(el) {
         return null;
     const typeMatch = cleanText.match(LESSON_TYPE_RE);
     const weeksMatch = cleanText.match(WEEKS_RE);
-    const roomMatch = cleanHtml.match(/(?:<sup>[^<]*<\/sup>)?([А-Яа-яA-Za-z]-\d+)/);
-    const teacherMatch = cleanHtml.match(/<br\s*\/?>\s*([^<]+?)(?:<br|<\/td|<div|<i|$)/);
+    const room = parseEntryRoom(cleanHtml, subject);
+    const teacherLine = linesAfterSubject(cleanHtml, subject).find((line) => {
+        const candidate = stripDistanceMarker(line);
+        return candidate.length > 0 && !SUBGROUP_RE.test(candidate);
+    }) ?? "";
     const subgroupMatch = cleanText.match(SUBGROUP_RE);
     const weekParity = parseWeekParity(cleanHtml);
     return {
-        room: roomMatch?.[1] ?? "",
+        room: room || undefined,
         subject,
         type: typeMatch?.[1] ?? "",
         weeks: parseWeeks(weeksMatch?.[1] ?? ""),
-        teacher: parseTeacher(teacherMatch?.[1] ?? ""),
-        groups: [],
+        teacher: teacherLine ? parseTeacher(teacherLine) : undefined,
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
         weekParity,
-        isDistance: DISTANCE_RE.test(cleanText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
+        isDistance: hasDistanceMarker(cleanText) || hasDistanceMarker(room ?? ""),
         substitutions: substitutions.length > 0 ? substitutions : undefined,
         possibleChanges,
     };
 }
-// --- Session schedule parsing (date-based, specific dates) ---
-function parseSessionSchedule(doc, educationType) {
+export function parseSessionScheduleWith(doc, entryParser) {
     const days = [];
     for (const dateCell of doc.querySelectorAll('td[id^="trd2"]')) {
         // Parse date from cell id: trd20251224 -> 2025-12-24
@@ -125,10 +132,7 @@ function parseSessionSchedule(doc, educationType) {
         const dateMatch = id.match(/trd(\d{4})(\d{2})(\d{2})/);
         if (!dateMatch)
             continue;
-        const year = parseInt(dateMatch[1]);
-        const month = parseInt(dateMatch[2]) - 1;
-        const dayNum = parseInt(dateMatch[3]);
-        const date = new Date(year, month, dayNum);
+        const date = `${dateMatch[1]}-${dateMatch[2]}-${dateMatch[3]}`;
         // Extract weekday from after <br>
         const cellHtml = dateCell.innerHTML ?? "";
         const brMatch = cellHtml.match(/<br\s*\/?>\s*(.+)/i);
@@ -139,25 +143,26 @@ function parseSessionSchedule(doc, educationType) {
         if (!dataCell?.matches("td.trdata:not(.trfd)")) {
             continue;
         }
-        const slots = [];
+        const blocks = [];
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
             const td = entryRow.querySelector("td") ?? entryRow;
-            const entry = parseSessionEntry(td);
+            const entry = entryParser(td);
             if (!entry)
                 continue;
-            slots.push({
-                number: getLessonNumber(entry.timeStart, educationType),
-                timeStart: entry.timeStart,
-                timeEnd: entry.timeEnd,
-                entries: [entry.entry],
+            blocks.push({
+                time: entry.time,
+                lessons: [entry.lesson],
             });
         }
-        if (slots.length > 0) {
-            days.push({ weekday, date, slots });
+        if (blocks.length > 0) {
+            days.push({ weekday, date, blocks });
         }
     }
     return days;
 }
+function parseSessionSchedule(doc) {
+    return parseSessionScheduleWith(doc, parseSessionEntry);
+}
 function parseSessionEntry(td) {
     const fullHtml = td.innerHTML ?? "";
     const plainText = text(td);
@@ -168,37 +173,30 @@ function parseSessionEntry(td) {
     const subject = subjectEl ? text(subjectEl) : "";
     if (!subject)
         return null;
-    // Room: text before the first <span
-    const roomMatch = fullHtml.match(/^([^<]*?)\s*<span/);
-    const room = roomMatch ? roomMatch[1].trim() : "";
+    const room = parseEntryRoom(fullHtml, subject);
     // Type: parenthesized text after </span>, case-insensitive
     const typeMatch = plainText.match(FLEXIBLE_LESSON_TYPE_RE_I);
     const type = typeMatch ? typeMatch[1].replace(/\.$/, "").toLowerCase() : "";
     const subgroupMatch = plainText.match(SUBGROUP_RE);
-    const parts = fullHtml
-        .split(/<br\s*\/?>/i)
-        .map((part) => part.replace(/<[^>]*>/g, "").trim())
-        .filter((part) => part.length > 0);
-    const teacherPart = parts.find((part) => !part.includes(subject) &&
+    const parts = linesAfterSubject(fullHtml, subject);
+    const teacherPart = parts.find((part) => stripDistanceMarker(part).length > 0 &&
         !/^\d{2}:\d{2}\s*-\s*\d{2}:\d{2}$/.test(part) &&
-        !SUBGROUP_RE.test(part)) ?? "";
+        !SUBGROUP_RE.test(part) &&
+        !containsGroupCode(stripDistanceMarker(part))) ?? "";
     // Time: after <br>, format HH:MM - HH:MM
     const timeMatch = fullHtml.match(/<br\s*\/?>\s*(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
     if (!timeMatch)
         return null;
     return {
-        entry: {
-            room,
+        lesson: {
+            room: room || undefined,
             subject,
             type,
-            weeks: { from: 0, to: 0 },
-            teacher: parseTeacher(teacherPart),
-            groups: [],
+            teacher: teacherPart ? parseTeacher(teacherPart) : undefined,
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
-            isDistance: DISTANCE_RE.test(plainText) || DISTANCE_RE.test(room),
+            isDistance: hasDistanceMarker(plainText) || hasDistanceMarker(room ?? ""),
             possibleChanges,
         },
-        timeStart: parseTime(timeMatch[1]),
-        timeEnd: parseTime(timeMatch[2]),
+        time: { start: parseTime(timeMatch[1]), end: parseTime(timeMatch[2]) },
     };
 }

package/dist/tt/parse/groups.d.ts

@@ -3,7 +3,7 @@
  *
  * Preserves in-name annotations (e.g. "КТ-42-25 (АихС)") and strips service
  * markers like "(N подгруппа)" — the subgroup number is carried separately on
- * {@link import("../types.js").ScheduleEntry.subgroup}.
+ * {@link import("../types.js").ParsedLesson.subgroup}.
  *
  * Examples:
  *   "КТ-42-25"                          -> ["КТ-42-25"]

package/dist/tt/parse/groups.js

@@ -4,7 +4,7 @@ import { SUBGROUP_ANNOTATION_RE_I } from "./patterns.js";
  *
  * Preserves in-name annotations (e.g. "КТ-42-25 (АихС)") and strips service
  * markers like "(N подгруппа)" — the subgroup number is carried separately on
- * {@link import("../types.js").ScheduleEntry.subgroup}.
+ * {@link import("../types.js").ParsedLesson.subgroup}.
  *
  * Examples:
  *   "КТ-42-25"                          -> ["КТ-42-25"]

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

@@ -1,6 +1,6 @@
 export { parseGroupsString } from "./groups.js";
-export { parseAcademicYearFromPage, parseAudienceButtons, parseAudienceName, parseFacultyButtons, parseGroupButtons, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
-export { parseFullSchedule } from "./full-schedule.js";
-export { parseAudienceFullSchedule, parseAudienceInfo, } from "./audience.js";
-export { parseTeacherFullSchedule, parseTeacherInfo, } from "./teacher.js";
+export { parseAcademicYearFromPage, parseRoomButtons, parseRoomName, parseFacultyButtons, parseGroupButtons, parseGroupName, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
+export { parseGroupSchedule } from "./full-schedule.js";
+export { parseRoomSchedule, parseRoomInfo, } from "./audience.js";
+export { parseTeacherSchedule, parseTeacherInfo, } from "./teacher.js";
 export { parseWebinars } from "./webinars.js";

package/dist/tt/parse/index.js

@@ -1,6 +1,6 @@
 export { parseGroupsString } from "./groups.js";
-export { parseAcademicYearFromPage, parseAudienceButtons, parseAudienceName, parseFacultyButtons, parseGroupButtons, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
-export { parseFullSchedule } from "./full-schedule.js";
-export { parseAudienceFullSchedule, parseAudienceInfo, } from "./audience.js";
-export { parseTeacherFullSchedule, parseTeacherInfo, } from "./teacher.js";
+export { parseAcademicYearFromPage, parseRoomButtons, parseRoomName, parseFacultyButtons, parseGroupButtons, parseGroupName, parsePeriodFromPage, parseTeacherButtons, } from "./lists.js";
+export { parseGroupSchedule } from "./full-schedule.js";
+export { parseRoomSchedule, parseRoomInfo, } from "./audience.js";
+export { parseTeacherSchedule, parseTeacherInfo, } from "./teacher.js";
 export { parseWebinars } from "./webinars.js";

package/dist/tt/parse/lists.d.ts

@@ -1,12 +1,13 @@
-import { Period } from "../../common/types.js";
-import type { Audience, Faculty, Group } from "../types.js";
-export declare function parsePeriodFromPage(html: string): Period | null;
+import { AcademicPeriod } from "../../common/types.js";
+import type { Faculty, Group, Room } from "../types.js";
+export declare function parsePeriodFromPage(html: string): AcademicPeriod | null;
 /** Parse the start year from labels like "2026/2027 учебный год". */
 export declare function parseAcademicYearFromPage(html: string): number | null;
 export declare function parseGroupButtons(html: string): Group[];
+export declare function parseGroupName(html: string): string | null;
 export declare function parseFacultyButtons(html: string): Faculty[];
-export declare function parseAudienceButtons(html: string): Audience[];
-export declare function parseAudienceName(html: string): string | null;
+export declare function parseRoomButtons(html: string): Room[];
+export declare function parseRoomName(html: string): string | null;
 export declare function parseTeacherButtons(html: string): {
     id: number;
     name: string;

package/dist/tt/parse/lists.js

@@ -49,6 +49,11 @@ export function parseGroupButtons(html) {
     }
     return groups;
 }
+export function parseGroupName(html) {
+    const doc = parseHtml(html);
+    const name = text(doc.querySelector('span.htext span[style*="color: blue"]'));
+    return name || null;
+}
 export function parseFacultyButtons(html) {
     const doc = parseHtml(html);
     const faculties = [];
@@ -61,7 +66,7 @@ export function parseFacultyButtons(html) {
     }
     return faculties;
 }
-export function parseAudienceButtons(html) {
+export function parseRoomButtons(html) {
     const results = [];
     const seen = new Set();
     const re = /<button[^>]*\bname="aud(\d+)"[^>]*\bvalue="([^"]*)"/g;
@@ -74,7 +79,7 @@ export function parseAudienceButtons(html) {
     }
     return results;
 }
-export function parseAudienceName(html) {
+export function parseRoomName(html) {
     const m = html.match(/id="path"[\s\S]*?findaud[^>]*>[^<]*<\/a>([\s\S]*?)<\/div>/);
     if (!m)
         return null;

package/dist/tt/parse/overlays.d.ts

@@ -1,10 +1,11 @@
-import type { ScheduleEntry, Substitution, TransferInfo } from "../types.js";
-export declare function parseDate(dd: string, mm: string, yyyy: string): Date;
+import type { LocalDate } from "../../common/types.js";
+import type { ParsedLesson, Substitution, TransferInfo } from "../types.js";
+export declare function parseDate(dd: string, mm: string, yyyy: string): LocalDate;
 export declare function parseTransferDiv(div: Element): {
     transfer: TransferInfo;
-    entry: ScheduleEntry;
+    entry: ParsedLesson;
 } | null;
 export declare function parseSubstitutionDiv(div: Element): Substitution | null;
 export declare function parseSubstituteForDiv(div: Element): {
-    entry: ScheduleEntry;
+    entry: ParsedLesson;
 } | null;

package/dist/tt/parse/overlays.js

@@ -1,11 +1,11 @@
 import { parseTeacher, text } from "../../common/parse.js";
 import { parseGroupsString } from "./groups.js";
+import { hasDistanceMarker } from "./entry-parts.js";
 import { LESSON_TYPE_PATTERN, LESSON_TYPE_RE, LESSON_TYPE_RE_I, SUBGROUP_RE, } from "./patterns.js";
 const GROUP_CODE_RE = /[A-ZА-ЯЁ]{1,}(?:-[A-ZА-ЯЁa-zа-яё0-9]+)+/u;
-const DISTANCE_RE = /дистанционно|ДОТ/i;
 const BLUE_SPAN_RE = /<span\b(?=[^>]*(?:style=["'][^"']*color:\s*blue|class=["'][^"']*\bblue\b))[^>]*>([^<]+)<\/span>/i;
 export function parseDate(dd, mm, yyyy) {
-    return new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
+    return `${yyyy}-${mm}-${dd}`;
 }
 export function parseTransferDiv(div) {
     const divText = text(div);
@@ -53,17 +53,17 @@ export function parseTransferDiv(div) {
     }
     const transfer = { targetDate, fromDate, fromSlot, subject };
     const subgroupMatch = divText.match(SUBGROUP_RE);
+    const groups = parseGroupsString(groupsPart);
     return {
         transfer,
         entry: {
-            room: roomMatch?.[1] ?? "",
+            room: roomMatch?.[1] || undefined,
             subject,
             type: typeMatch?.[1] ?? "",
-            weeks: { from: 0, to: 0 },
-            teacher: parseTeacher(teacherPart),
-            groups: parseGroupsString(groupsPart),
+            teacher: teacherPart ? parseTeacher(teacherPart) : undefined,
+            groups: groups.length > 0 ? groups : undefined,
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
-            isDistance: DISTANCE_RE.test(divText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
+            isDistance: hasDistanceMarker(divText) || hasDistanceMarker(roomMatch?.[1] ?? ""),
             transfer,
         },
     };
@@ -83,7 +83,7 @@ export function parseSubstitutionDiv(div) {
     const teacherMatch = divHtml.match(/Преподаватель:\s*<span[^>]*>([^<]+)<\/span>/);
     if (teacherMatch)
         teacher = parseTeacher(teacherMatch[1].trim());
-    return { date, room, teacher, isDistance: DISTANCE_RE.test(room ?? divText) };
+    return { date, room, teacher, isDistance: hasDistanceMarker(room ?? divText) };
 }
 export function parseSubstituteForDiv(div) {
     const divText = text(div);
@@ -96,7 +96,7 @@ export function parseSubstituteForDiv(div) {
     const origTeacherMatch = divHtml.match(/замена\s*вместо:\s*<\/b><\/span>\s*<span[^>]*>([^<]+)<\/span>/);
     const originalTeacher = origTeacherMatch
         ? parseTeacher(origTeacherMatch[1].trim())
-        : { name: "" };
+        : undefined;
     // Subject: second blue span
     const subjectEl = div.querySelectorAll('span[style*="color: blue"]');
     let subject = "";
@@ -113,16 +113,15 @@ export function parseSubstituteForDiv(div) {
     const typeMatch = divText.match(LESSON_TYPE_RE);
     const groupsMatch = divHtml.match(new RegExp(`\\((?:${LESSON_TYPE_PATTERN})\\)\\s*(?:<br\\s*\\/?>)\\s*([^<]+?)(?:\\s*<i|$)`));
     const subgroupMatch = divText.match(SUBGROUP_RE);
+    const groups = parseGroupsString(groupsMatch?.[1]);
     return {
         entry: {
-            room: roomMatch?.[1] ?? "",
+            room: roomMatch?.[1] || undefined,
             subject,
             type: typeMatch?.[1] ?? "",
-            weeks: { from: 0, to: 0 },
-            teacher: { name: "" },
-            groups: parseGroupsString(groupsMatch?.[1]),
+            groups: groups.length > 0 ? groups : undefined,
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
-            isDistance: DISTANCE_RE.test(divText) || DISTANCE_RE.test(roomMatch?.[1] ?? ""),
+            isDistance: hasDistanceMarker(divText) || hasDistanceMarker(roomMatch?.[1] ?? ""),
             substituteFor: { date, originalTeacher },
         },
     };

package/dist/tt/parse/patterns.d.ts

@@ -1,5 +1,5 @@
-export declare const LESSON_TYPE_PATTERN = "\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447\u043E|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441|\u043A\u043F";
-export declare const FLEXIBLE_LESSON_TYPE_PATTERN = "(?:\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447\u043E|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441|\u043A\u043F)\\.?|\u042D\u043A\u0437";
+export declare const LESSON_TYPE_PATTERN = "\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447\u043E|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441|\u043A\u043F|\u0438\u0437|\u0433\u0437|\u043A\u0440\u043F";
+export declare const FLEXIBLE_LESSON_TYPE_PATTERN = "(?:\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447\u043E|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441|\u043A\u043F|\u0438\u0437|\u0433\u0437|\u043A\u0440\u043F)\\.?|\u042D\u043A\u0437";
 export declare const LESSON_TYPE_RE: RegExp;
 export declare const LESSON_TYPE_RE_I: RegExp;
 export declare const FLEXIBLE_LESSON_TYPE_RE_I: RegExp;

package/dist/tt/parse/patterns.js

@@ -1,9 +1,9 @@
-export const LESSON_TYPE_PATTERN = "лк|пр|лб|зачо|зач|экз|конс|кп";
+export const LESSON_TYPE_PATTERN = "лк|пр|лб|зачо|зач|экз|конс|кп|из|гз|крп";
 export const FLEXIBLE_LESSON_TYPE_PATTERN = `(?:${LESSON_TYPE_PATTERN})\\.?|Экз`;
-export const LESSON_TYPE_RE = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`);
+export const LESSON_TYPE_RE = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`, "i");
 export const LESSON_TYPE_RE_I = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`, "i");
 export const FLEXIBLE_LESSON_TYPE_RE_I = new RegExp(`\\((${FLEXIBLE_LESSON_TYPE_PATTERN})\\)`, "i");
-export const LESSON_TYPE_GLOBAL_RE = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`, "g");
+export const LESSON_TYPE_GLOBAL_RE = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`, "gi");
 export const WEEKS_RE = /\(([^)]*нед\.?[^)]*)\)/;
 export const WEEKS_GLOBAL_RE = /\([^)]*нед\.?[^)]*\)/g;
 export const SUBGROUP_RE = /(\d+)\s*подгруппа/;

package/dist/tt/parse/teacher.d.ts

@@ -1,4 +1,3 @@
-import { EducationType } from "../../common/types.js";
-import type { FullScheduleDay, TeacherInfo } from "../types.js";
-export declare function parseTeacherFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
+import type { ParsedScheduleDay, TeacherInfo } from "../types.js";
+export declare function parseTeacherSchedule(html: string): ParsedScheduleDay[];
 export declare function parseTeacherInfo(html: string): TeacherInfo | null;