chuvsu-js 2.0.0 → 2.1.1

package/dist/browser.d.ts

@@ -1,5 +1,5 @@
 export { Schedule } from "./tt/schedule.js";
-export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } from "./tt/utils.js";
 export { Period, EducationType } from "./common/types.js";
 export type { Time, WeekRange, Teacher, } from "./common/types.js";
 export type { Faculty, Group, ScheduleEntry, FullScheduleSlot, FullScheduleDay, LessonTimeSlot, Lesson, LessonTime, SemesterWeek, } from "./tt/types.js";

package/dist/browser.js

@@ -1,2 +1,2 @@
 export { Schedule } from "./tt/schedule.js";
-export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } from "./tt/utils.js";

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
 export { Schedule } from "./tt/schedule.js";
 export type { CacheEntry } from "./common/cache.js";
-export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } 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";

package/dist/index.js

@@ -1,5 +1,5 @@
 export { LkClient } from "./lk/client.js";
 export { TtClient } from "./tt/client.js";
 export { Schedule } from "./tt/schedule.js";
-export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, } from "./tt/utils.js";
 export { AuthError, ParseError } from "./common/types.js";

package/dist/tt/client.js

@@ -104,7 +104,7 @@ export class TtClient {
             return cached;
         const url = `${BASE}/index/grouptt/gr/${groupId}`;
         const { body } = await this.authPost(url, { htype: String(period) });
-        const days = parseFullSchedule(body);
+        const days = parseFullSchedule(body, this.educationType);
         this.cache?.set("schedule", cacheKey, days);
         return days;
     }
@@ -121,7 +121,7 @@ export class TtClient {
         for (const { period, days } of results) {
             schedules.set(period, days);
         }
-        return new Schedule(groupId, schedules);
+        return new Schedule(groupId, schedules, undefined, this.educationType);
     }
     /**
      * Get schedule for a specific period only.
@@ -130,7 +130,7 @@ export class TtClient {
         const days = await this.fetchSchedule(opts.groupId, opts.period);
         const schedules = new Map();
         schedules.set(opts.period, days);
-        return new Schedule(opts.groupId, schedules, opts.period);
+        return new Schedule(opts.groupId, schedules, opts.period, this.educationType);
     }
     // --- Search / Discovery ---
     async getFaculties() {

package/dist/tt/parse.d.ts

@@ -1,4 +1,4 @@
-import type { Period } from "../common/types.js";
+import { type Period, EducationType } from "../common/types.js";
 import type { Faculty, Group, FullScheduleDay } from "./types.js";
 export declare function parsePeriodFromPage(html: string): Period | null;
 export declare function parseGroupButtons(html: string): Group[];
@@ -7,4 +7,4 @@ export declare function parseTeacherButtons(html: string): {
     id: number;
     name: string;
 }[];
-export declare function parseFullSchedule(html: string): FullScheduleDay[];
+export declare function parseFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];

package/dist/tt/parse.js

@@ -1,4 +1,5 @@
 import { parseHtml, text, parseTime, parseWeeks, parseTeacher, parseWeekParity, } from "../common/parse.js";
+import { getLessonNumber } from "./utils.js";
 const PERIOD_LABELS = {
     "осенний семестр": 1,
     "зимняя сессия": 2,
@@ -54,11 +55,12 @@ export function parseTeacherButtons(html) {
     }
     return results;
 }
-export function parseFullSchedule(html) {
+export function parseFullSchedule(html, educationType) {
     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);
+        return parseSessionSchedule(doc, edType);
     }
     return parseSemesterSchedule(doc);
 }
@@ -134,7 +136,7 @@ function parseSemesterEntry(el) {
     };
 }
 // --- Session schedule parsing (date-based, specific dates) ---
-function parseSessionSchedule(doc) {
+function parseSessionSchedule(doc, educationType) {
     const days = [];
     for (const dateCell of doc.querySelectorAll('td[id^="trd2"]')) {
         // Parse date from cell id: trd20251224 -> 2025-12-24
@@ -159,14 +161,13 @@ function parseSessionSchedule(doc) {
             continue;
         // Parse entries
         const slots = [];
-        let slotNumber = 1;
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
             const td = entryRow.querySelector("td") ?? entryRow;
             const entry = parseSessionEntry(td);
             if (!entry)
                 continue;
             slots.push({
-                number: slotNumber++,
+                number: getLessonNumber(entry.timeStart, educationType),
                 timeStart: entry.timeStart,
                 timeEnd: entry.timeEnd,
                 entries: [entry.entry],

package/dist/tt/schedule.d.ts

@@ -1,10 +1,11 @@
 import type { FullScheduleDay, SemesterWeek, Lesson } from "./types.js";
-import { Period } from "../common/types.js";
+import { Period, EducationType } from "../common/types.js";
 export declare class Schedule {
     readonly groupId: number;
-    private scheduleMap;
+    readonly scheduleMap: Map<number, FullScheduleDay[]>;
+    readonly educationType: EducationType;
     private _period?;
-    constructor(groupId: number, schedules: Map<number, FullScheduleDay[]>, period?: Period);
+    constructor(groupId: number, scheduleMap: Map<number, FullScheduleDay[]>, period?: Period, educationType?: EducationType);
     /** Current (or fixed) period for this schedule. */
     get period(): Period;
     /** Days for the current period. */
@@ -16,7 +17,6 @@ export declare class Schedule {
     private getSlotsForWeekday;
     private getDateForWeekday;
     private static isSameDay;
-    private getSessionLessonsForDate;
     forDay(weekday: number, opts?: {
         subgroup?: number;
         week?: number;

package/dist/tt/schedule.js

@@ -1,11 +1,13 @@
-import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, filterSlots, slotsToLessons, } from "./utils.js";
+import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, } from "./utils.js";
 export class Schedule {
     groupId;
     scheduleMap;
+    educationType;
     _period;
-    constructor(groupId, schedules, period) {
+    constructor(groupId, scheduleMap, period, educationType) {
         this.groupId = groupId;
-        this.scheduleMap = schedules;
+        this.scheduleMap = scheduleMap;
+        this.educationType = educationType ?? 1 /* EducationType.HigherEducation */;
         this._period = period;
     }
     /** Current (or fixed) period for this schedule. */
@@ -55,12 +57,6 @@ export class Schedule {
             a.getMonth() === b.getMonth() &&
             a.getDate() === b.getDate());
     }
-    getSessionLessonsForDate(days, date) {
-        const day = days.find((d) => d.date && Schedule.isSameDay(d.date, date));
-        if (!day)
-            return [];
-        return slotsToLessons(day.slots, date);
-    }
     // --- Public query methods ---
     forDay(weekday, opts) {
         const period = this.period;
@@ -82,67 +78,54 @@ export class Schedule {
     }
     forDate(date, opts) {
         const period = getCurrentPeriod({ date });
-        const days = this.getDays(period);
-        if (isSessionPeriod(period)) {
-            const lessons = this.getSessionLessonsForDate(days, date);
-            if (lessons.length > 0)
-                return lessons;
+        const lessons = [];
+        // 1. Check all periods for date-based (session) entries matching this date
+        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));
+                }
+            }
         }
-        // Try session periods for exact date match (sessions can have entries
-        // on dates that fall outside their "official" period boundaries)
-        for (const [p, d] of this.scheduleMap) {
-            if (p === period)
-                continue;
-            const match = d.find((day) => day.date && Schedule.isSameDay(day.date, date));
-            if (match)
-                return slotsToLessons(match.slots, date);
+        // 2. Check applicable semester for weekday-based entries
+        const semesterPeriod = isSessionPeriod(period)
+            ? getAdjacentSemester(period)
+            : period;
+        const semesterDays = this.getDays(semesterPeriod);
+        if (semesterDays.length > 0) {
+            const week = getWeekNumber({ period: semesterPeriod, date });
+            if (week >= 0 && week <= 17) {
+                const weekday = date.getDay();
+                const slots = this.getSlotsForWeekday(weekday, semesterDays, {
+                    subgroup: opts?.subgroup,
+                    week,
+                });
+                lessons.push(...slotsToLessons(slots, date));
+            }
         }
-        if (isSessionPeriod(period))
-            return [];
-        const weekday = date.getDay();
-        const week = getWeekNumber({ period, date });
-        const slots = this.getSlotsForWeekday(weekday, days, {
-            subgroup: opts?.subgroup,
-            week,
-        });
-        return slotsToLessons(slots, date);
+        return lessons;
     }
     forWeek(week, opts) {
         const period = this.period;
-        const days = this.getDays(period);
-        if (isSessionPeriod(period)) {
-            // For sessions, return all entries within this calendar week
-            const now = new Date();
-            const monday = getMonday(now);
-            const sunday = new Date(monday);
-            sunday.setDate(monday.getDate() + 6);
-            sunday.setHours(23, 59, 59, 999);
-            const lessons = [];
-            for (const d of days) {
-                if (d.date && d.date >= monday && d.date <= sunday) {
-                    lessons.push(...slotsToLessons(d.slots, d.date));
-                }
-            }
-            return lessons;
+        // Determine the Monday of the target week
+        let mondayDate;
+        if (week != null && !isSessionPeriod(period)) {
+            const semesterWeeks = getSemesterWeeks({
+                period,
+                weekCount: week,
+            });
+            const weekData = semesterWeeks.find((w) => w.week === week);
+            mondayDate = weekData ? weekData.start : getMonday(new Date());
+        }
+        else {
+            mondayDate = getMonday(new Date());
         }
-        const effectiveWeek = week ?? getWeekNumber({ period });
-        const semesterWeeks = getSemesterWeeks({
-            period,
-            weekCount: effectiveWeek,
-        });
-        const weekData = semesterWeeks.find((w) => w.week === effectiveWeek);
-        const mondayDate = weekData ? weekData.start : new Date();
         const lessons = [];
         for (let i = 0; i < 7; i++) {
             const date = new Date(mondayDate);
             date.setDate(mondayDate.getDate() + i);
             date.setHours(0, 0, 0, 0);
-            const weekday = i === 6 ? 0 : i + 1;
-            const slots = this.getSlotsForWeekday(weekday, days, {
-                subgroup: opts?.subgroup,
-                week: effectiveWeek,
-            });
-            lessons.push(...slotsToLessons(slots, date));
+            lessons.push(...this.forDate(date, opts));
         }
         return lessons;
     }

package/dist/tt/utils.d.ts

@@ -1,5 +1,6 @@
-import type { FullScheduleSlot, SemesterWeek, Lesson } from "./types.js";
-import { Period } from "../common/types.js";
+import type { FullScheduleSlot, SemesterWeek, Lesson, LessonTimeSlot } from "./types.js";
+import { Period, EducationType } from "../common/types.js";
+import type { Time } from "../common/types.js";
 export declare function getCurrentPeriod(opts?: {
     date?: Date;
 }): Period;
@@ -36,3 +37,6 @@ export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
     week?: number;
 }): FullScheduleSlot[];
 export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date): Lesson[];
+export declare function getTimeSlots(educationType: EducationType): LessonTimeSlot[];
+export declare function getLessonNumber(time: Time, educationType: EducationType): number;
+export declare function getAdjacentSemester(session: Period): Period;

package/dist/tt/utils.js

@@ -141,3 +141,50 @@ export function slotsToLessons(slots, date) {
     }
     return lessons;
 }
+// --- Lesson time slots ---
+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 } },
+];
+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 } },
+];
+export function getTimeSlots(educationType) {
+    return educationType === 2 /* EducationType.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;
+}
+export function getAdjacentSemester(session) {
+    return session === 2 /* Period.WinterSession */
+        ? 1 /* Period.FallSemester */
+        : 3 /* Period.SpringSemester */;
+}

package/package.json

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