chuvsu-js 2.5.0 → 2.6.1

package/dist/index.d.ts

@@ -7,4 +7,4 @@ export type { Holiday, HolidayTransfer } from "./tt/utils.js";
 export { Period, EducationType, AuthError, ParseError, } from "./common/types.js";
 export type { Time, WeekRange, Teacher } from "./common/types.js";
 export type { PersonalData } from "./lk/types.js";
-export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, TransferInfo, TeacherInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";
+export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, Substitution, SubstituteForInfo, TransferInfo, TeacherInfo, TtClientOptions, CacheConfig, } from "./tt/types.js";

package/dist/tt/client.js

@@ -203,13 +203,13 @@ export class TtClient {
         for (const { period, days } of results) {
             schedules.set(period, days);
         }
-        return new Schedule(teacherId, schedules, undefined, this.educationType);
+        return new Schedule(teacherId, schedules, undefined, this.educationType, undefined, undefined, true);
     }
     async getTeacherScheduleForPeriod(opts) {
         const days = await this.fetchTeacherSchedule(opts.teacherId, opts.period);
         const schedules = new Map();
         schedules.set(opts.period, days);
-        return new Schedule(opts.teacherId, schedules, opts.period, this.educationType);
+        return new Schedule(opts.teacherId, schedules, opts.period, this.educationType, undefined, undefined, true);
     }
     async getTeacherInfo(teacherId) {
         const url = `${BASE}/index/techtt/tech/${teacherId}`;

package/dist/tt/parse.js

@@ -130,10 +130,18 @@ function parseTransferDiv(div) {
         return null;
     const roomMatch = divHtml.match(/([А-Яа-яA-Za-z]-\d+)/);
     const typeMatch = divText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
-    // Teacher: last text line before closing </div>
+    // Teacher: last text line that isn't a subgroup marker
     const parts = divHtml.split(/<br\s*\/?>/);
-    const lastPart = parts[parts.length - 1]?.replace(/<[^>]*>/g, "").trim();
+    let teacherPart = "";
+    for (let i = parts.length - 1; i >= 0; i--) {
+        const clean = parts[i].replace(/<[^>]*>/g, "").trim();
+        if (clean && !/подгруппа/.test(clean)) {
+            teacherPart = clean;
+            break;
+        }
+    }
     const transfer = { targetDate, fromDate, fromSlot, subject };
+    const subgroupMatch = divText.match(/(\d+)\s*подгруппа/);
     return {
         transfer,
         entry: {
@@ -141,7 +149,8 @@ function parseTransferDiv(div) {
             subject,
             type: typeMatch?.[1] ?? "",
             weeks: { from: 0, to: 0 },
-            teacher: parseTeacher(lastPart ?? ""),
+            teacher: parseTeacher(teacherPart),
+            subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
             transfer,
         },
     };
@@ -163,6 +172,47 @@ function parseSubstitutionDiv(div) {
         teacher = parseTeacher(teacherMatch[1].trim());
     return { date, room, teacher };
 }
+function parseSubstituteForDiv(div) {
+    const divText = text(div);
+    const divHtml = div.innerHTML ?? "";
+    const m = divText.match(/(\d{2})\.(\d{2})\.(\d{4})\s*замена\s*вместо:/);
+    if (!m)
+        return null;
+    const date = parseDate(m[1], m[2], m[3]);
+    // Original teacher: first blue span (right after "замена вместо:")
+    const origTeacherMatch = divHtml.match(/замена\s*вместо:\s*<\/b><\/span>\s*<span[^>]*>([^<]+)<\/span>/);
+    const originalTeacher = origTeacherMatch
+        ? parseTeacher(origTeacherMatch[1].trim())
+        : { name: "" };
+    // Subject: second blue span
+    const subjectEl = div.querySelectorAll('span[style*="color: blue"]');
+    let subject = "";
+    for (const el of subjectEl) {
+        const t = text(el);
+        if (t && t !== origTeacherMatch?.[1]?.trim()) {
+            subject = t;
+            break;
+        }
+    }
+    if (!subject)
+        return null;
+    const roomMatch = divHtml.match(/(?:<br\s*\/?>)\s*([А-Яа-яA-Za-z]-\d+)/);
+    const typeMatch = divText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
+    const groupsMatch = divHtml.match(/\((?:лк|пр|лб|зач|экз|зчО|кр|конс)\)\s*(?:<br\s*\/?>)\s*([^<]+?)(?:\s*<i|$)/);
+    const subgroupMatch = divText.match(/(\d+)\s*подгруппа/);
+    return {
+        entry: {
+            room: roomMatch?.[1] ?? "",
+            subject,
+            type: typeMatch?.[1] ?? "",
+            weeks: { from: 0, to: 0 },
+            teacher: { name: "" },
+            groups: groupsMatch?.[1]?.trim() ?? "",
+            subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            substituteFor: { date, originalTeacher },
+        },
+    };
+}
 function parseSemesterEntry(el) {
     const td = el.querySelector("td") ?? el;
     const fullHtml = td.innerHTML ?? "";
@@ -319,6 +369,15 @@ function parseTeacherSemesterEntry(el) {
             return result.entry;
         }
     }
+    // Check for "замена вместо:" (substitute lesson for another teacher)
+    for (const div of redDivs) {
+        const result = parseSubstituteForDiv(div);
+        if (result) {
+            if (possibleChanges)
+                result.entry.possibleChanges = true;
+            return result.entry;
+        }
+    }
     const substitutions = [];
     for (const div of redDivs) {
         const sub = parseSubstitutionDiv(div);

package/dist/tt/schedule.d.ts

@@ -5,12 +5,14 @@ export declare class Schedule {
     readonly groupId: number;
     readonly scheduleMap: Map<number, FullScheduleDay[]>;
     readonly educationType: EducationType;
+    /** Whether this is a teacher schedule (affects substitution handling). */
+    readonly isTeacherSchedule: boolean;
     /** List of holidays to exclude from schedule queries. Pass `[]` to disable. */
     readonly holidays: Holiday[];
     /** Government decree day-off transfers (Постановление Правительства). */
     readonly holidayTransfers: HolidayTransfer[];
     private _period?;
-    constructor(groupId: number, scheduleMap: Map<number, FullScheduleDay[]>, period?: Period, educationType?: EducationType, holidays?: Holiday[] | null, holidayTransfers?: HolidayTransfer[]);
+    constructor(groupId: number, scheduleMap: Map<number, FullScheduleDay[]>, period?: Period, educationType?: EducationType, holidays?: Holiday[] | null, holidayTransfers?: HolidayTransfer[], isTeacherSchedule?: boolean);
     /** Current (or fixed) period for this schedule. */
     get period(): Period;
     /** Days for the current period. */

package/dist/tt/schedule.js

@@ -3,15 +3,18 @@ export class Schedule {
     groupId;
     scheduleMap;
     educationType;
+    /** Whether this is a teacher schedule (affects substitution handling). */
+    isTeacherSchedule;
     /** List of holidays to exclude from schedule queries. Pass `[]` to disable. */
     holidays;
     /** Government decree day-off transfers (Постановление Правительства). */
     holidayTransfers;
     _period;
-    constructor(groupId, scheduleMap, period, educationType, holidays, holidayTransfers) {
+    constructor(groupId, scheduleMap, period, educationType, holidays, holidayTransfers, isTeacherSchedule) {
         this.groupId = groupId;
         this.scheduleMap = scheduleMap;
         this.educationType = educationType ?? 1 /* EducationType.HigherEducation */;
+        this.isTeacherSchedule = isTeacherSchedule ?? false;
         this._period = period;
         this.holidays = holidays ?? RUSSIAN_HOLIDAYS;
         this.holidayTransfers = holidayTransfers ?? [];
@@ -73,14 +76,14 @@ export class Schedule {
             const dayName = getWeekdayName(weekday);
             for (const d of days) {
                 if (d.weekday.toLowerCase() === dayName.toLowerCase() && d.date) {
-                    lessons.push(...slotsToLessons(d.slots, d.date));
+                    lessons.push(...slotsToLessons(d.slots, d.date, { isTeacherSchedule: this.isTeacherSchedule }));
                 }
             }
             return lessons.sort(sortLessons);
         }
         const slots = this.getSlotsForWeekday(weekday, days, opts);
         const date = this.getDateForWeekday(weekday, period, opts?.week);
-        return slotsToLessons(slots, date);
+        return slotsToLessons(slots, date, { isTeacherSchedule: this.isTeacherSchedule });
     }
     forDate(date, opts) {
         if (isHoliday(date, this.holidays, this.holidayTransfers))
@@ -91,7 +94,7 @@ export class Schedule {
         for (const [, d] of this.scheduleMap) {
             for (const day of d) {
                 if (day.date && Schedule.isSameDay(day.date, date)) {
-                    lessons.push(...slotsToLessons(day.slots, date));
+                    lessons.push(...slotsToLessons(day.slots, date, { isTeacherSchedule: this.isTeacherSchedule }));
                 }
             }
         }
@@ -109,7 +112,7 @@ export class Schedule {
                     week,
                     date,
                 });
-                lessons.push(...slotsToLessons(slots, date));
+                lessons.push(...slotsToLessons(slots, date, { isTeacherSchedule: this.isTeacherSchedule }));
             }
             // 3. Suppress lessons that were transferred away from this date
             const transfers = collectTransfers(semesterDays);

package/dist/tt/types.d.ts

@@ -18,6 +18,13 @@ export interface Substitution {
     /** New teacher, if changed. */
     teacher?: Teacher;
 }
+/** Info about a lesson this teacher is substituting for another teacher. */
+export interface SubstituteForInfo {
+    /** The date this substitute lesson takes place. */
+    date: Date;
+    /** The original teacher being replaced. */
+    originalTeacher: Teacher;
+}
 /** Info about a lesson transferred from another date/slot. */
 export interface TransferInfo {
     /** Date when this lesson takes place (target). */
@@ -43,6 +50,8 @@ export interface ScheduleEntry {
     substitutions?: Substitution[];
     /** If this entry is a transferred lesson (перенос). */
     transfer?: TransferInfo;
+    /** If this entry is a substitute lesson (замена вместо). */
+    substituteFor?: SubstituteForInfo;
     /** Whether this entry is marked as potentially changing (class="want"). */
     possibleChanges?: boolean;
 }
@@ -86,6 +95,8 @@ export interface Lesson {
     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;
 }

package/dist/tt/utils.d.ts

@@ -38,7 +38,9 @@ export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
     week?: number;
     date?: Date;
 }): FullScheduleSlot[];
-export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): Lesson[];
+export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date, opts?: {
+    isTeacherSchedule?: boolean;
+}): Lesson[];
 /** Collect all transfer entries from schedule days. */
 export declare function collectTransfers(days: FullScheduleDay[]): ScheduleEntry[];
 /** Remove lessons whose source date/slot match a transfer. */

package/dist/tt/utils.js

@@ -95,14 +95,21 @@ function isSameDay(a, b) {
 }
 function filterEntries(entries, opts) {
     return entries.filter((e) => {
+        // Subgroup filter applies to all entry types
+        if (opts?.subgroup && e.subgroup && e.subgroup !== opts.subgroup) {
+            return false;
+        }
         // Transfer entries: only include when the query date matches the target date
         if (e.transfer) {
             if (!opts?.date)
                 return false;
             return isSameDay(e.transfer.targetDate, opts.date);
         }
-        if (opts?.subgroup && e.subgroup && e.subgroup !== opts.subgroup) {
-            return false;
+        // Substitute-for entries: only include when the query date matches
+        if (e.substituteFor) {
+            if (!opts?.date)
+                return false;
+            return isSameDay(e.substituteFor.date, opts.date);
         }
         if (opts?.week != null) {
             if (e.weeks.from > 0 &&
@@ -135,7 +142,7 @@ function makeLessonTime(date, time) {
     d.setHours(time.hours, time.minutes, 0, 0);
     return { date: d, hours: time.hours, minutes: time.minutes };
 }
-export function slotsToLessons(slots, date) {
+export function slotsToLessons(slots, date, opts) {
     const lessons = [];
     for (const slot of slots) {
         for (const entry of slot.entries) {
@@ -152,6 +159,10 @@ export function slotsToLessons(slots, date) {
                         room = sub.room;
                     }
                     if (sub.teacher) {
+                        // On teacher schedules, a teacher substitution means another teacher
+                        // is taking over — exclude the lesson entirely.
+                        if (opts?.isTeacherSchedule)
+                            continue;
                         originalTeacher = teacher;
                         teacher = sub.teacher;
                     }
@@ -172,6 +183,7 @@ export function slotsToLessons(slots, date) {
                 originalRoom,
                 originalTeacher,
                 transfer: entry.transfer,
+                substituteFor: entry.substituteFor,
                 possibleChanges: entry.possibleChanges,
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chuvsu-js",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Node.js library for ChuvSU student portal (lk.chuvsu.ru) and schedule (tt.chuvsu.ru)",
   "type": "module",
   "main": "dist/index.js",