chuvsu-js 2.4.1 → 2.4.2

package/dist/index.d.ts

@@ -2,8 +2,8 @@ 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, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
-export type { Holiday } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, getEffectiveHolidays, getHolidayTransfers, getCompensatingWorkDays, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
+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";

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, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
+export { getCurrentPeriod, isSessionPeriod, getSemesterStart, getSemesterWeeks, getWeekNumber, getWeekdayName, getTimeSlots, getLessonNumber, getAdjacentSemester, isHoliday, getEffectiveHolidays, getHolidayTransfers, getCompensatingWorkDays, RUSSIAN_HOLIDAYS, } from "./tt/utils.js";
 export { AuthError, ParseError, } from "./common/types.js";

package/dist/tt/schedule.d.ts

@@ -1,14 +1,16 @@
 import type { FullScheduleDay, SemesterWeek, Lesson } from "./types.js";
 import { Period, EducationType } from "../common/types.js";
-import { type Holiday } from "./utils.js";
+import { type Holiday, type HolidayTransfer } from "./utils.js";
 export declare class Schedule {
     readonly groupId: number;
     readonly scheduleMap: Map<number, FullScheduleDay[]>;
     readonly educationType: EducationType;
     /** 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);
+    constructor(groupId: number, scheduleMap: Map<number, FullScheduleDay[]>, period?: Period, educationType?: EducationType, holidays?: Holiday[] | null, holidayTransfers?: HolidayTransfer[]);
     /** Current (or fixed) period for this schedule. */
     get period(): Period;
     /** Days for the current period. */

package/dist/tt/schedule.js

@@ -5,13 +5,16 @@ export class Schedule {
     educationType;
     /** 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) {
+    constructor(groupId, scheduleMap, period, educationType, holidays, holidayTransfers) {
         this.groupId = groupId;
         this.scheduleMap = scheduleMap;
         this.educationType = educationType ?? 1 /* EducationType.HigherEducation */;
         this._period = period;
         this.holidays = holidays ?? RUSSIAN_HOLIDAYS;
+        this.holidayTransfers = holidayTransfers ?? [];
     }
     /** Current (or fixed) period for this schedule. */
     get period() {
@@ -80,7 +83,7 @@ export class Schedule {
         return slotsToLessons(slots, date);
     }
     forDate(date, opts) {
-        if (isHoliday(date, this.holidays))
+        if (isHoliday(date, this.holidays, this.holidayTransfers))
             return [];
         const period = getCurrentPeriod({ date });
         const lessons = [];

package/dist/tt/utils.d.ts

@@ -54,10 +54,50 @@ export interface Holiday {
     /** Human-readable name. */
     name: string;
 }
+/**
+ * A government-decree day-off transfer (Постановление Правительства).
+ * Moves a day off from one date to another.
+ */
+export interface HolidayTransfer {
+    /** The date that becomes a day off. */
+    dayOff: Date;
+    /** The date that becomes a working day (e.g. a Saturday). `null` if no compensating work day. */
+    workDay: Date | null;
+}
 /** Russian non-working public holidays (Статья 112 ТК РФ). */
 export declare const RUSSIAN_HOLIDAYS: Holiday[];
 /**
- * Returns true if the given date falls on a holiday.
- * Pass an empty array to disable holiday checking.
+ * Compute effective non-working holiday dates for a given year.
+ *
+ * Rules (Art. 112 ТК РФ):
+ * 1. All holidays in the list are non-working days.
+ * 2. For non-January holidays: if a holiday falls on Sat/Sun, the day off
+ *    automatically transfers to the next working day.
+ * 3. For January holidays (1–8): weekend transfers are NOT automatic —
+ *    they are decided by annual government decree. Pass them via `transfers`.
+ * 4. Bridge days: if a non-January holiday falls on Tue, Mon is day off
+ *    (preceding Sat works); if on Thu, Fri is day off (following Sat works).
+ *    Computed automatically, can be overridden via `transfers`.
+ * 5. Government decree transfers (`transfers`) add extra days off and
+ *    override auto-computed bridge days.
+ * 6. For 6-day week (`sixDayWeek`): Saturday is a work day, so
+ *    Thursday bridges don't apply and Saturday holidays don't auto-transfer.
+ */
+export declare function getEffectiveHolidays(year: number, holidays?: Holiday[], transfers?: HolidayTransfer[], sixDayWeek?: boolean): Date[];
+/**
+ * Compute all transfers (auto bridges + explicit) for a given year.
+ * Useful for getting compensating work days (Saturdays that become working).
+ */
+export declare function getHolidayTransfers(year: number, holidays: Holiday[] | undefined, transfers: HolidayTransfer[] | undefined, sixDayWeek: boolean): HolidayTransfer[];
+/**
+ * Returns the list of compensating work days (e.g. Saturdays that become working).
+ * Includes both auto-computed bridge compensations and explicit transfers.
+ */
+export declare function getCompensatingWorkDays(year: number, holidays: Holiday[] | undefined, transfers: HolidayTransfer[] | undefined, sixDayWeek: boolean): Date[];
+/**
+ * Returns true if the given date is a non-working holiday,
+ * including transferred holidays when they fall on weekends (Art. 112 ТК РФ)
+ * and auto-computed bridge days.
+ * Pass an empty array for `holidays` to disable holiday checking.
  */
-export declare function isHoliday(date: Date, holidays?: Holiday[]): boolean;
+export declare function isHoliday(date: Date, holidays?: Holiday[], transfers?: HolidayTransfer[], sixDayWeek?: boolean): boolean;

package/dist/tt/utils.js

@@ -324,11 +324,185 @@ export const RUSSIAN_HOLIDAYS = [
     { month: 11, day: 4, name: "День народного единства" },
 ];
 /**
- * Returns true if the given date falls on a holiday.
- * Pass an empty array to disable holiday checking.
+ * January holiday dates (1–8) are excluded from automatic weekend transfer
+ * per Art. 112 ТК РФ. Their transfers are decided by government decree.
  */
-export function isHoliday(date, holidays = RUSSIAN_HOLIDAYS) {
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-    return holidays.some((h) => h.month === month && h.day === day);
+function isJanuaryHoliday(h) {
+    return h.month === 1 && h.day >= 1 && h.day <= 8;
+}
+/**
+ * Compute bridge-day transfers for non-January holidays.
+ *
+ * Pattern (consistent across government decrees):
+ * - Holiday on Tuesday → Monday becomes day off, preceding Saturday is work day
+ * - Holiday on Thursday → Friday becomes day off, following Saturday is work day
+ *   (only for 5-day week; 6-day week has Saturday classes, so no gap to bridge)
+ *
+ * January holidays are excluded (their 2 transfers are unpredictable).
+ */
+function computeBridgeDays(year, holidays, effectiveDays, sixDayWeek) {
+    const bridges = [];
+    for (const h of holidays) {
+        if (isJanuaryHoliday(h))
+            continue;
+        const date = new Date(year, h.month - 1, h.day);
+        const dow = date.getDay();
+        if (dow === 2) {
+            // Tuesday → Monday off, preceding Saturday works
+            const monday = new Date(date);
+            monday.setDate(date.getDate() - 1);
+            const saturday = new Date(date);
+            saturday.setDate(date.getDate() - 3);
+            if (!effectiveDays.some((d) => isSameDay(d, monday))) {
+                bridges.push({
+                    dayOff: monday,
+                    workDay: sixDayWeek ? null : saturday,
+                });
+            }
+        }
+        else if (dow === 4 && !sixDayWeek) {
+            // Thursday → Friday off, following Saturday works
+            // Only for 5-day week: 6-day week has no gap (Saturday is a work day)
+            const friday = new Date(date);
+            friday.setDate(date.getDate() + 1);
+            const saturday = new Date(date);
+            saturday.setDate(date.getDate() + 2);
+            if (!effectiveDays.some((d) => isSameDay(d, friday))) {
+                bridges.push({ dayOff: friday, workDay: saturday });
+            }
+        }
+    }
+    return bridges;
+}
+/**
+ * Compute effective non-working holiday dates for a given year.
+ *
+ * Rules (Art. 112 ТК РФ):
+ * 1. All holidays in the list are non-working days.
+ * 2. For non-January holidays: if a holiday falls on Sat/Sun, the day off
+ *    automatically transfers to the next working day.
+ * 3. For January holidays (1–8): weekend transfers are NOT automatic —
+ *    they are decided by annual government decree. Pass them via `transfers`.
+ * 4. Bridge days: if a non-January holiday falls on Tue, Mon is day off
+ *    (preceding Sat works); if on Thu, Fri is day off (following Sat works).
+ *    Computed automatically, can be overridden via `transfers`.
+ * 5. Government decree transfers (`transfers`) add extra days off and
+ *    override auto-computed bridge days.
+ * 6. For 6-day week (`sixDayWeek`): Saturday is a work day, so
+ *    Thursday bridges don't apply and Saturday holidays don't auto-transfer.
+ */
+export function getEffectiveHolidays(year, holidays = RUSSIAN_HOLIDAYS, transfers = [], sixDayWeek = true) {
+    const originalDates = holidays.map((h) => new Date(year, h.month - 1, h.day));
+    const isOriginalHoliday = (d) => originalDates.some((od) => isSameDay(od, d));
+    const effectiveDays = [...originalDates];
+    // Auto-transfer: only non-January holidays that fall on weekends
+    const nonJanuaryOnWeekend = holidays
+        .filter((h) => !isJanuaryHoliday(h))
+        .map((h) => new Date(year, h.month - 1, h.day))
+        .filter((d) => d.getDay() === 0 || d.getDay() === 6)
+        .sort((a, b) => a.getTime() - b.getTime());
+    for (const holiday of nonJanuaryOnWeekend) {
+        let candidate = new Date(holiday);
+        if (candidate.getDay() === 6) {
+            candidate.setDate(candidate.getDate() + 2);
+        }
+        else {
+            candidate.setDate(candidate.getDate() + 1);
+        }
+        while (candidate.getDay() === 0 ||
+            candidate.getDay() === 6 ||
+            isOriginalHoliday(candidate) ||
+            effectiveDays.some((ed) => isSameDay(ed, candidate))) {
+            candidate.setDate(candidate.getDate() + 1);
+        }
+        effectiveDays.push(new Date(candidate));
+    }
+    // Bridge days (auto-computed, can be overridden)
+    const autoBridges = computeBridgeDays(year, holidays, effectiveDays, sixDayWeek);
+    // Merge: explicit transfers override auto-computed bridges
+    const allTransfers = [...autoBridges];
+    for (const t of transfers) {
+        const idx = allTransfers.findIndex((b) => isSameDay(b.dayOff, t.dayOff));
+        if (idx !== -1) {
+            allTransfers[idx] = t;
+        }
+        else {
+            allTransfers.push(t);
+        }
+    }
+    const compensatingWorkDays = [];
+    for (const t of allTransfers) {
+        if (!effectiveDays.some((d) => isSameDay(d, t.dayOff))) {
+            effectiveDays.push(t.dayOff);
+        }
+        if (t.workDay) {
+            compensatingWorkDays.push(t.workDay);
+        }
+    }
+    return effectiveDays.sort((a, b) => a.getTime() - b.getTime());
+}
+/**
+ * Compute all transfers (auto bridges + explicit) for a given year.
+ * Useful for getting compensating work days (Saturdays that become working).
+ */
+export function getHolidayTransfers(year, holidays = RUSSIAN_HOLIDAYS, transfers = [], sixDayWeek) {
+    const originalDates = holidays.map((h) => new Date(year, h.month - 1, h.day));
+    const effectiveDays = [...originalDates];
+    // Replay weekend transfers to build effectiveDays for bridge computation
+    const nonJanuaryOnWeekend = holidays
+        .filter((h) => !isJanuaryHoliday(h))
+        .map((h) => new Date(year, h.month - 1, h.day))
+        .filter((d) => d.getDay() === 0 || d.getDay() === 6)
+        .sort((a, b) => a.getTime() - b.getTime());
+    const isOriginalHoliday = (d) => originalDates.some((od) => isSameDay(od, d));
+    for (const holiday of nonJanuaryOnWeekend) {
+        let candidate = new Date(holiday);
+        if (candidate.getDay() === 6) {
+            candidate.setDate(candidate.getDate() + 2);
+        }
+        else {
+            candidate.setDate(candidate.getDate() + 1);
+        }
+        while (candidate.getDay() === 0 ||
+            candidate.getDay() === 6 ||
+            isOriginalHoliday(candidate) ||
+            effectiveDays.some((ed) => isSameDay(ed, candidate))) {
+            candidate.setDate(candidate.getDate() + 1);
+        }
+        effectiveDays.push(new Date(candidate));
+    }
+    const autoBridges = computeBridgeDays(year, holidays, effectiveDays, sixDayWeek);
+    const allTransfers = [...autoBridges];
+    for (const t of transfers) {
+        const idx = allTransfers.findIndex((b) => isSameDay(b.dayOff, t.dayOff));
+        if (idx !== -1) {
+            allTransfers[idx] = t;
+        }
+        else {
+            allTransfers.push(t);
+        }
+    }
+    return allTransfers;
+}
+/**
+ * Returns the list of compensating work days (e.g. Saturdays that become working).
+ * Includes both auto-computed bridge compensations and explicit transfers.
+ */
+export function getCompensatingWorkDays(year, holidays = RUSSIAN_HOLIDAYS, transfers = [], sixDayWeek) {
+    return getHolidayTransfers(year, holidays, transfers, sixDayWeek)
+        .filter((t) => t.workDay != null)
+        .map((t) => t.workDay);
+}
+/**
+ * Returns true if the given date is a non-working holiday,
+ * including transferred holidays when they fall on weekends (Art. 112 ТК РФ)
+ * and auto-computed bridge days.
+ * Pass an empty array for `holidays` to disable holiday checking.
+ */
+export function isHoliday(date, holidays = RUSSIAN_HOLIDAYS, transfers = [], sixDayWeek = true) {
+    if (holidays.length === 0 && transfers.length === 0)
+        return false;
+    const year = date.getFullYear();
+    const effectiveDays = getEffectiveHolidays(year, holidays, transfers, sixDayWeek);
+    return effectiveDays.some((d) => isSameDay(d, date));
 }

package/package.json

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