chuvsu-js 5.2.1 → 5.2.2

package/README.md

@@ -1,5 +1,8 @@
 # chuvsu-js
 
+> [!WARNING]
+> Ооочень плохой вайбкод, библиотека будет переделана и не раз. Есть очень много пространства для упрощения использования и сохранения крутой архитектуры.
+
 Типизированная библиотека для сервисов ЧГУ им. И. Н. Ульянова:
 
 - `tt.chuvsu.ru` — расписания групп, преподавателей, аудиторий и вебинары;

package/dist/tt/domain/repository.js

@@ -597,9 +597,6 @@ export class TimetableRepository {
             if (!observation.subject.trim()) {
                 throw new Error(`Empty lesson subject in ${source.sourceKey}/${observation.key}`);
             }
-            if (!observation.type.trim()) {
-                throw new Error(`Empty lesson type in ${source.sourceKey}/${observation.key}`);
-            }
             const relations = [
                 ["group", observation.groups, observation.groups.values.map((value) => value.group)],
                 ["teacher", observation.teachers, observation.teachers.values],

package/dist/tt/domain/types.d.ts

@@ -62,6 +62,7 @@ export interface LessonSeries {
     academicYearStartYear: number;
     period: AcademicPeriod;
     subject: string;
+    /** Free-form portal label; empty when no source exposes one. */
     type: string;
     slotNumber?: number;
     time?: TimeRange;
@@ -84,6 +85,7 @@ export interface LessonOccurrence {
     nominalDate: LocalDate;
     scheduledDate: LocalDate;
     subject: string;
+    /** Free-form portal label; empty when no source exposes one. */
     type: string;
     slotNumber?: number;
     time?: TimeRange;
@@ -105,6 +107,7 @@ interface ObservationBase {
     /** Stable only inside one source page projection. */
     key: string;
     subject: string;
+    /** Free-form portal label; empty when this source does not expose one. */
     type: string;
     slotNumber?: number;
     time?: TimeRange;

package/dist/tt/parse/audience.js

@@ -2,8 +2,8 @@ import { parseHtml, parseTeacher, parseTime, parseWeekParity, parseWeeks, text,
 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, 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";
+import { LESSON_TYPE_GLOBAL_RE, SUBGROUP_ANNOTATION_RE, SUBGROUP_RE, WEEKS_GLOBAL_RE, WEEKS_RE, } from "./patterns.js";
+import { containsGroupCode, hasDistanceMarker, linesAfterSubject, parseLessonTypeAfterSubject, 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>
@@ -104,10 +104,11 @@ function parseRoomSemesterEntry(el) {
         cleanText = cleanText.replace(text(div), "");
     }
     const subjectEl = td.querySelector('span[style*="color: blue"]');
-    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subjectEl)
+        return null;
+    const subject = text(subjectEl);
     if (!subject)
         return null;
-    const typeMatch = cleanText.match(LESSON_TYPE_RE);
     const weeksMatch = cleanText.match(WEEKS_RE);
     const subgroupMatch = cleanText.match(SUBGROUP_RE);
     const weekParity = parseWeekParity(cleanHtml);
@@ -127,7 +128,7 @@ function parseRoomSemesterEntry(el) {
     const groups = parseGroupsString(groupsLine);
     return {
         subject,
-        type: typeMatch?.[1] ?? "",
+        type: parseLessonTypeAfterSubject(subjectEl),
         weeks: parseWeeks(weeksMatch?.[1] ?? ""),
         teacher: teacherLine ? parseTeacher(teacherLine) : undefined,
         groups: groups.length > 0 ? groups : undefined,
@@ -149,13 +150,14 @@ 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 (!subjectEl)
+        return null;
+    const subject = 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)));
@@ -165,7 +167,7 @@ function parseRoomSessionEntry(td) {
     return {
         lesson: {
             subject,
-            type: typeMatch?.[1].replace(/\.$/, "").toLowerCase() ?? "",
+            type: parseLessonTypeAfterSubject(subjectEl).toLowerCase(),
             teacher: teacherLine ? parseTeacher(stripDistanceMarker(teacherLine)) : undefined,
             groups: groups.length > 0 ? groups : undefined,
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,

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

@@ -6,3 +6,8 @@ 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;
+/**
+ * Lesson type is free-form portal data. Its stable marker is position: the first
+ * parenthesized value immediately after the blue subject span.
+ */
+export declare function parseLessonTypeAfterSubject(subjectElement: Element): string;

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

@@ -2,6 +2,9 @@ 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;
+const LEADING_PARENTHESIZED_RE = /^\s*\(([^()]*)\)/u;
+const WEEK_METADATA_RE = /(?:^|\s)нед\.?(?:\s|$)/iu;
+const SUBGROUP_METADATA_RE = /^\d+\s*подгруппа$/iu;
 export function entryHtmlLines(html) {
     return html.split(BR_RE).map((line) => line.trim());
 }
@@ -50,3 +53,25 @@ export function stripDistanceMarker(value) {
 export function containsGroupCode(value) {
     return value.split(/\s+/).some((token) => GROUP_TOKEN_RE.test(token));
 }
+/**
+ * Lesson type is free-form portal data. Its stable marker is position: the first
+ * parenthesized value immediately after the blue subject span.
+ */
+export function parseLessonTypeAfterSubject(subjectElement) {
+    let suffix = "";
+    for (let sibling = subjectElement.nextSibling; sibling; sibling = sibling.nextSibling) {
+        if (sibling.tagName?.toLowerCase() === "br")
+            break;
+        suffix += sibling.textContent ?? "";
+    }
+    const candidate = suffix.match(LEADING_PARENTHESIZED_RE)?.[1]
+        ?.trim()
+        .replace(/\.$/, "") ?? "";
+    if (!candidate ||
+        WEEK_METADATA_RE.test(candidate) ||
+        SUBGROUP_METADATA_RE.test(candidate) ||
+        candidate.toUpperCase() === "ДОТ") {
+        return "";
+    }
+    return candidate;
+}

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

@@ -1,7 +1,7 @@
 import { parseHtml, parseTeacher, parseTime, parseWeekParity, parseWeeks, text, } from "../../common/parse.js";
 import { parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
-import { FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
-import { hasDistanceMarker, containsGroupCode, linesAfterSubject, parseEntryRoom, stripDistanceMarker, } from "./entry-parts.js";
+import { SUBGROUP_RE, WEEKS_RE } from "./patterns.js";
+import { hasDistanceMarker, containsGroupCode, linesAfterSubject, parseLessonTypeAfterSubject, parseEntryRoom, stripDistanceMarker, } from "./entry-parts.js";
 export function parseGroupSchedule(html) {
     const doc = parseHtml(html);
     // Session layout has date-based cells with ids like "trd20251224"
@@ -99,10 +99,11 @@ function parseSemesterEntry(el) {
         cleanText = cleanText.replace(text(div), "");
     }
     const subjectEl = td.querySelector('span[style*="color: blue"]');
-    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subjectEl)
+        return null;
+    const subject = text(subjectEl);
     if (!subject)
         return null;
-    const typeMatch = cleanText.match(LESSON_TYPE_RE);
     const weeksMatch = cleanText.match(WEEKS_RE);
     const room = parseEntryRoom(cleanHtml, subject);
     const teacherLine = linesAfterSubject(cleanHtml, subject).find((line) => {
@@ -114,7 +115,7 @@ function parseSemesterEntry(el) {
     return {
         room: room || undefined,
         subject,
-        type: typeMatch?.[1] ?? "",
+        type: parseLessonTypeAfterSubject(subjectEl),
         weeks: parseWeeks(weeksMatch?.[1] ?? ""),
         teacher: teacherLine ? parseTeacher(teacherLine) : undefined,
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
@@ -170,13 +171,14 @@ function parseSessionEntry(td) {
         return null;
     const possibleChanges = (td.getAttribute("class") ?? "").includes("want") || undefined;
     const subjectEl = td.querySelector('span[style*="color: blue"]');
-    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subjectEl)
+        return null;
+    const subject = text(subjectEl);
     if (!subject)
         return null;
     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 type = parseLessonTypeAfterSubject(subjectEl).toLowerCase();
     const subgroupMatch = plainText.match(SUBGROUP_RE);
     const parts = linesAfterSubject(fullHtml, subject);
     const teacherPart = parts.find((part) => stripDistanceMarker(part).length > 0 &&

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|\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_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|\u043A\u0440";
+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|\u043A\u0440)\\.?|\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,4 +1,4 @@
-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})\\)`, "i");
 export const LESSON_TYPE_RE_I = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`, "i");

package/dist/tt/parse/teacher.js

@@ -2,8 +2,8 @@ import { parseHtml, parseTime, parseWeekParity, parseWeeks, text, } from "../../
 import { parseSemesterScheduleWith, parseSessionScheduleWith, } from "./full-schedule.js";
 import { parseGroupsString } from "./groups.js";
 import { parseSubstituteForDiv, parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
-import { FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
-import { containsGroupCode, hasDistanceMarker, linesAfterSubject, parseEntryRoom, stripDistanceMarker, } from "./entry-parts.js";
+import { SUBGROUP_RE, WEEKS_RE } from "./patterns.js";
+import { containsGroupCode, hasDistanceMarker, linesAfterSubject, parseEntryRoom, parseLessonTypeAfterSubject, stripDistanceMarker, } from "./entry-parts.js";
 export function parseTeacherSchedule(html) {
     const doc = parseHtml(html);
     if (doc.querySelector('td[id^="trd2"]')) {
@@ -49,10 +49,11 @@ function parseTeacherSemesterEntry(el) {
         cleanText = cleanText.replace(text(div), "");
     }
     const subjectEl = td.querySelector('span[style*="color: blue"]');
-    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subjectEl)
+        return null;
+    const subject = text(subjectEl);
     if (!subject)
         return null;
-    const typeMatch = cleanText.match(LESSON_TYPE_RE);
     const weeksMatch = cleanText.match(WEEKS_RE);
     const room = parseEntryRoom(cleanHtml, subject);
     const groupsLine = linesAfterSubject(cleanHtml, subject).find((line) => containsGroupCode(stripDistanceMarker(line))) ?? "";
@@ -62,7 +63,7 @@ function parseTeacherSemesterEntry(el) {
     return {
         room: room || undefined,
         subject,
-        type: typeMatch?.[1] ?? "",
+        type: parseLessonTypeAfterSubject(subjectEl),
         weeks: parseWeeks(weeksMatch?.[1] ?? ""),
         groups: groups.length > 0 ? groups : undefined,
         subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
@@ -79,12 +80,13 @@ function parseTeacherSessionEntry(td) {
         return null;
     const possibleChanges = (td.getAttribute("class") ?? "").includes("want") || undefined;
     const subjectEl = td.querySelector('span[style*="color: blue"]');
-    const subject = subjectEl ? text(subjectEl) : "";
+    if (!subjectEl)
+        return null;
+    const subject = text(subjectEl);
     if (!subject)
         return null;
     const room = parseEntryRoom(fullHtml, subject);
-    const typeMatch = plainText.match(FLEXIBLE_LESSON_TYPE_RE_I);
-    const type = typeMatch ? typeMatch[1].replace(/\.$/, "").toLowerCase() : "";
+    const type = parseLessonTypeAfterSubject(subjectEl).toLowerCase();
     const subgroupMatch = plainText.match(SUBGROUP_RE);
     const timeMatch = fullHtml.match(/<br\s*\/?>\s*(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
     if (!timeMatch)

package/dist/tt/types.d.ts

@@ -71,6 +71,7 @@ export interface ParsedLesson {
     /** Missing means this source projection does not expose room information. */
     room?: string | null;
     subject: string;
+    /** Free-form portal label; empty when this source does not expose one. */
     type: string;
     /** Recurrence range; absent for concrete session lessons or unknown evidence. */
     weeks?: WeekRange;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chuvsu-js",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "Библиотека для расписания и личного кабинета ЧГУ им. И. Н. Ульянова",
   "type": "module",
   "main": "dist/index.js",