chuvsu-js 2.2.0 → 2.2.1

package/dist/tt/schedule.js

@@ -1,4 +1,4 @@
-import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, } from "./utils.js";
+import { getCurrentPeriod, isSessionPeriod, getWeekdayName, getMonday, getSemesterStart, getSemesterWeeks, getWeekNumber, getAdjacentSemester, filterSlots, slotsToLessons, sortLessons, } from "./utils.js";
 export class Schedule {
     groupId;
     scheduleMap;
@@ -70,7 +70,7 @@ export class Schedule {
                     lessons.push(...slotsToLessons(d.slots, d.date));
                 }
             }
-            return lessons;
+            return lessons.sort(sortLessons);
         }
         const slots = this.getSlotsForWeekday(weekday, days, opts);
         const date = this.getDateForWeekday(weekday, period, opts?.week);
@@ -103,7 +103,7 @@ export class Schedule {
                 lessons.push(...slotsToLessons(slots, date));
             }
         }
-        return lessons;
+        return lessons.sort(sortLessons);
     }
     forWeek(week, opts) {
         const period = this.period;
@@ -127,18 +127,18 @@ export class Schedule {
             date.setHours(0, 0, 0, 0);
             lessons.push(...this.forDate(date, opts));
         }
-        return lessons;
+        return lessons.sort(sortLessons);
     }
     today(opts) {
-        return this.forDate(new Date(), opts);
+        return this.forDate(new Date(), opts).sort(sortLessons);
     }
     tomorrow(opts) {
         const date = new Date();
         date.setDate(date.getDate() + 1);
-        return this.forDate(date, opts);
+        return this.forDate(date, opts).sort(sortLessons);
     }
     thisWeek(opts) {
-        return this.forWeek(undefined, opts);
+        return this.forWeek(undefined, opts).sort(sortLessons);
     }
     currentLesson(opts) {
         const now = new Date();

package/dist/tt/utils.d.ts

@@ -5,6 +5,7 @@ export declare function getCurrentPeriod(opts?: {
     date?: Date;
 }): Period;
 export declare function isSessionPeriod(period: Period): boolean;
+export declare function sortLessons(a: Lesson, b: Lesson): number;
 export declare function getWeekdayName(weekday: number): string;
 export declare function getMonday(date: Date): Date;
 /**

package/dist/tt/utils.js

@@ -17,6 +17,9 @@ export function getCurrentPeriod(opts) {
 export function isSessionPeriod(period) {
     return period === 2 /* Period.WinterSession */ || period === 4 /* Period.SummerSession */;
 }
+export function sortLessons(a, b) {
+    return a.start.date.getTime() - b.start.date.getTime();
+}
 const WEEKDAY_NAMES = [
     "Воскресенье",
     "Понедельник",
@@ -143,23 +146,83 @@ export function slotsToLessons(slots, date) {
 }
 // --- 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 } },
+    {
+        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 } },
+    {
+        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 */

package/package.json

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