chuvsu-js 2.8.2 → 3.0.1

package/dist/tt/utils/index.js

@@ -0,0 +1,6 @@
+export { getMonday, getWeekdayName, isSameDay } 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 { collectTransfers, filterSlots, slotsToLessons, sortLessons, suppressTransferredLessons, } from "./lessons.js";
+export { getCompensatingWorkDays, getEffectiveHolidays, getHolidayTransfers, isHoliday, RUSSIAN_HOLIDAYS, } from "./holidays.js";

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

@@ -0,0 +1,14 @@
+import type { FullScheduleDay, FullScheduleSlot, Lesson, ScheduleEntry } from "../types.js";
+export declare function sortLessons(a: Lesson, b: Lesson): number;
+export declare function filterSlots(slots: FullScheduleSlot[], opts?: {
+    subgroup?: number;
+    week?: number;
+    date?: Date;
+}): FullScheduleSlot[];
+export declare function slotsToLessons(slots: FullScheduleSlot[], date: Date, opts?: {
+    isTeacherSchedule?: boolean;
+}): Lesson[];
+/** All transfer entries from the given schedule days. */
+export declare function collectTransfers(days: FullScheduleDay[]): ScheduleEntry[];
+/** Remove lessons whose source date/slot match a transfer. */
+export declare function suppressTransferredLessons(lessons: Lesson[], transfers: ScheduleEntry[], date: Date): Lesson[];

package/dist/tt/utils/lessons.js

@@ -0,0 +1,123 @@
+import { isSameDay } from "./date.js";
+export function sortLessons(a, b) {
+    return a.start.date.getTime() - b.start.date.getTime();
+}
+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);
+        }
+        // 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 &&
+                (opts.week < e.weeks.from || opts.week > e.weeks.to)) {
+                return false;
+            }
+            if (e.weekParity) {
+                const isEven = opts.week % 2 === 0;
+                if (e.weekParity === "even" && !isEven)
+                    return false;
+                if (e.weekParity === "odd" && isEven)
+                    return false;
+            }
+        }
+        return true;
+    });
+}
+export function filterSlots(slots, opts) {
+    if (opts?.subgroup == null && opts?.week == null && opts?.date == null)
+        return slots;
+    return slots
+        .map((slot) => ({
+        ...slot,
+        entries: filterEntries(slot.entries, opts),
+    }))
+        .filter((slot) => slot.entries.length > 0);
+}
+function makeLessonTime(date, time) {
+    const d = new Date(date);
+    d.setHours(time.hours, time.minutes, 0, 0);
+    return { date: d, hours: time.hours, minutes: time.minutes };
+}
+export function slotsToLessons(slots, date, opts) {
+    const lessons = [];
+    for (const slot of slots) {
+        for (const entry of slot.entries) {
+            let room = entry.room;
+            let teacher = entry.teacher;
+            let originalRoom;
+            let originalTeacher;
+            // Apply date-specific substitutions
+            if (entry.substitutions) {
+                const sub = entry.substitutions.find((s) => isSameDay(s.date, date));
+                if (sub) {
+                    if (sub.room) {
+                        originalRoom = room;
+                        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;
+                    }
+                }
+            }
+            lessons.push({
+                number: slot.number,
+                start: makeLessonTime(date, slot.timeStart),
+                end: makeLessonTime(date, slot.timeEnd),
+                subject: entry.subject,
+                type: entry.type,
+                room,
+                teacher,
+                groups: entry.groups,
+                weeks: entry.weeks,
+                subgroup: entry.subgroup,
+                weekParity: entry.weekParity,
+                originalRoom,
+                originalTeacher,
+                transfer: entry.transfer,
+                substituteFor: entry.substituteFor,
+                possibleChanges: entry.possibleChanges,
+            });
+        }
+    }
+    return lessons;
+}
+/** All transfer entries from the given schedule days. */
+export function collectTransfers(days) {
+    const transfers = [];
+    for (const day of days) {
+        for (const slot of day.slots) {
+            for (const entry of slot.entries) {
+                if (entry.transfer)
+                    transfers.push(entry);
+            }
+        }
+    }
+    return transfers;
+}
+/** Remove lessons whose source date/slot match a transfer. */
+export function suppressTransferredLessons(lessons, transfers, date) {
+    return lessons.filter((lesson) => {
+        return !transfers.some((t) => t.transfer &&
+            isSameDay(t.transfer.fromDate, date) &&
+            t.transfer.fromSlot === lesson.number &&
+            t.transfer.subject === lesson.subject);
+    });
+}

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

@@ -0,0 +1,6 @@
+import { Period } 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;

package/dist/tt/utils/period.js

@@ -0,0 +1,24 @@
+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 */;
+    // Feb-May -> Spring semester (весенний семестр)
+    if (month >= 1 && month <= 4)
+        return 3 /* Period.SpringSemester */;
+    // Jun-Aug -> Summer session (летняя сессия)
+    if (month >= 5 && month <= 7)
+        return 4 /* Period.SummerSession */;
+    // Sep - Dec 24 -> Fall semester (осенний семестр)
+    return 1 /* Period.FallSemester */;
+}
+export function isSessionPeriod(period) {
+    return period === 2 /* Period.WinterSession */ || period === 4 /* Period.SummerSession */;
+}
+export function getAdjacentSemester(session) {
+    return session === 2 /* Period.WinterSession */
+        ? 1 /* Period.FallSemester */
+        : 3 /* Period.SpringSemester */;
+}

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

@@ -0,0 +1,30 @@
+import { Period } from "../../common/types.js";
+import type { SemesterWeek } from "../types.js";
+/**
+ * Start date of a semester.
+ * Fall: September 1 of the semester year.
+ * Spring: first Monday of February of the semester year.
+ * If year is omitted, the semester year is derived from the current
+ * academic year instead of the calendar year.
+ */
+export declare function getSemesterStart(opts: {
+    period: Period;
+    year?: number;
+    date?: Date;
+}): Date;
+/**
+ * All weeks in a semester with their start/end dates.
+ * Week 0 starts from the semester start date.
+ */
+export declare function getSemesterWeeks(opts: {
+    period: Period;
+    year?: number;
+    date?: Date;
+    weekCount?: number;
+}): SemesterWeek[];
+/** Current week number within a semester. */
+export declare function getWeekNumber(opts: {
+    period: Period;
+    year?: number;
+    date?: Date;
+}): number;

package/dist/tt/utils/semester.js

@@ -0,0 +1,64 @@
+import { getMonday } from "./date.js";
+function getAcademicYearStartYear(date) {
+    const year = date.getFullYear();
+    const month = date.getMonth();
+    // Academic year starts in September.
+    return month >= 8 ? year : year - 1;
+}
+function resolveSemesterYear(opts) {
+    if (opts.year != null)
+        return opts.year;
+    const baseDate = opts.date ?? new Date();
+    const academicYearStart = getAcademicYearStartYear(baseDate);
+    return opts.period === 1 /* Period.FallSemester */
+        ? academicYearStart
+        : academicYearStart + 1;
+}
+/**
+ * Start date of a semester.
+ * Fall: September 1 of the semester year.
+ * Spring: first Monday of February of the semester year.
+ * If year is omitted, the semester year is derived from the current
+ * academic year instead of the calendar year.
+ */
+export function getSemesterStart(opts) {
+    const year = resolveSemesterYear(opts);
+    if (opts.period === 1 /* Period.FallSemester */) {
+        return new Date(year, 8, 1); // September 1
+    }
+    // Spring: first Monday of February
+    const feb1 = new Date(year, 1, 1);
+    const day = feb1.getDay();
+    const daysToAdd = day === 1 ? 0 : day === 0 ? 1 : 8 - day;
+    const firstMonday = new Date(year, 1, 1 + daysToAdd);
+    firstMonday.setHours(0, 0, 0, 0);
+    return firstMonday;
+}
+/**
+ * All weeks in a semester with their start/end dates.
+ * Week 0 starts from the semester start date.
+ */
+export function getSemesterWeeks(opts) {
+    const weekCount = opts.weekCount ?? 17;
+    const semesterStart = getSemesterStart(opts);
+    const startMonday = getMonday(semesterStart);
+    const weeks = [];
+    for (let i = 0; i <= weekCount; i++) {
+        const start = new Date(startMonday);
+        start.setDate(startMonday.getDate() + i * 7);
+        const end = new Date(start);
+        end.setDate(start.getDate() + 6);
+        end.setHours(23, 59, 59, 999);
+        weeks.push({ week: i, start, end });
+    }
+    return weeks;
+}
+/** Current week number within a semester. */
+export function getWeekNumber(opts) {
+    const date = opts.date ?? new Date();
+    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));
+}

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

@@ -0,0 +1,5 @@
+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;

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

@@ -0,0 +1,41 @@
+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;
+}

package/package.json

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

package/dist/tt/parse.d.ts

@@ -1,16 +0,0 @@
-import { type Period, EducationType } from "../common/types.js";
-import type { Audience, AudienceInfo, Faculty, Group, FullScheduleDay, TeacherInfo } from "./types.js";
-export declare function parsePeriodFromPage(html: string): Period | null;
-export declare function parseGroupButtons(html: string): Group[];
-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 parseTeacherButtons(html: string): {
-    id: number;
-    name: string;
-}[];
-export declare function parseFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
-export declare function parseAudienceInfo(html: string): AudienceInfo | null;
-export declare function parseAudienceFullSchedule(html: string): FullScheduleDay[];
-export declare function parseTeacherFullSchedule(html: string, educationType?: EducationType): FullScheduleDay[];
-export declare function parseTeacherInfo(html: string): TeacherInfo | null;