chuvsu-js 4.1.0 → 4.1.2

package/dist/tt/parse/full-schedule.js

@@ -133,13 +133,12 @@ function parseSessionSchedule(doc, educationType) {
         const cellHtml = dateCell.innerHTML ?? "";
         const brMatch = cellHtml.match(/<br\s*\/?>\s*(.+)/i);
         const weekday = brMatch ? brMatch[1].trim() : "";
-        // Data cell is the next td.trdata sibling in the same row
-        const row = dateCell.parentElement;
-        if (!row)
-            continue;
-        const dataCell = row.querySelector("td.trdata:not(.trfd)");
-        if (!dataCell)
+        // Live session tables repeat the date cell after the data cell. Only the
+        // leading date cell has the schedule data as its next sibling.
+        const dataCell = dateCell.nextElementSibling;
+        if (!dataCell?.matches("td.trdata:not(.trfd)")) {
             continue;
+        }
         const slots = [];
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
             const td = entryRow.querySelector("td") ?? entryRow;

package/dist/tt/parse/overlays.js

@@ -3,26 +3,33 @@ import { parseGroupsString } from "./groups.js";
 import { LESSON_TYPE_PATTERN, LESSON_TYPE_RE, LESSON_TYPE_RE_I, SUBGROUP_RE, } from "./patterns.js";
 const GROUP_CODE_RE = /[A-ZА-ЯЁ]{1,}(?:-[A-ZА-ЯЁa-zа-яё0-9]+)+/u;
 const DISTANCE_RE = /дистанционно|ДОТ/i;
+const BLUE_SPAN_RE = /<span\b(?=[^>]*(?:style=["'][^"']*color:\s*blue|class=["'][^"']*\bblue\b))[^>]*>([^<]+)<\/span>/i;
 export function parseDate(dd, mm, yyyy) {
     return new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
 }
 export function parseTransferDiv(div) {
     const divText = text(div);
     const divHtml = div.innerHTML ?? "";
-    const m = divText.match(/(\d{2})\.(\d{2})\.(\d{4})\s*перенос\s*c\s*(\d{2})\.(\d{2})\.(\d{4})\s*\((\d+)\s*пара\)/);
+    const m = divText.match(/(\d{2})\.(\d{2})\.(\d{4})\s*перенос\s*[cс]\s*(\d{2})\.(\d{2})\.(\d{4})\s*\((\d+)\s*пара\)/iu);
     if (!m)
         return null;
     const targetDate = parseDate(m[1], m[2], m[3]);
     const fromDate = parseDate(m[4], m[5], m[6]);
     const fromSlot = parseInt(m[7]);
+    const lineHtmls = divHtml.split(/<br\s*\/?>/i);
+    const lessonLineHtml = lineHtmls.find((line) => {
+        const lineText = line.replace(/<[^>]*>/g, "").trim();
+        return BLUE_SPAN_RE.test(line) && LESSON_TYPE_RE_I.test(lineText);
+    }) ?? "";
+    const subjectMatch = lessonLineHtml.match(BLUE_SPAN_RE);
     const subjectEl = div.querySelector('span[style*="color: blue"]');
-    const subject = subjectEl ? text(subjectEl) : "";
+    const subject = subjectMatch?.[1]?.trim() ?? (subjectEl ? text(subjectEl) : "");
     if (!subject)
         return null;
-    const roomMatch = divHtml.match(/([А-Яа-яA-Za-z]-\d+)/);
+    const roomMatch = lessonLineHtml.match(/([А-Яа-яA-Za-z]-\d+)/) ??
+        divHtml.match(/([А-Яа-яA-Za-z]-\d+)/);
     const typeMatch = divText.match(LESSON_TYPE_RE);
-    const parts = divHtml
-        .split(/<br\s*\/?>/i)
+    const parts = lineHtmls
         .map((part) => part.replace(/<[^>]*>/g, "").trim())
         .filter((part) => part.length > 0);
     let teacherPart = "";
@@ -31,13 +38,15 @@ export function parseTransferDiv(div) {
         const cleaned = part.trim();
         if (!cleaned)
             continue;
+        const isLessonMeta = cleaned.includes(subject) ||
+            (roomMatch?.[1] != null && cleaned.includes(roomMatch[1])) ||
+            LESSON_TYPE_RE_I.test(cleaned);
+        if (isLessonMeta)
+            continue;
         if (GROUP_CODE_RE.test(cleaned)) {
             groupsPart = cleaned;
             continue;
         }
-        const isLessonMeta = cleaned.includes(subject) ||
-            (roomMatch?.[1] != null && cleaned.includes(roomMatch[1])) ||
-            LESSON_TYPE_RE_I.test(cleaned);
         if (!isLessonMeta && !teacherPart) {
             teacherPart = cleaned;
         }

package/dist/tt/parse/teacher.js

@@ -3,7 +3,7 @@ import { getLessonNumber } from "../utils/index.js";
 import { parseSemesterScheduleWith } from "./full-schedule.js";
 import { parseGroupsString } from "./groups.js";
 import { parseSubstituteForDiv, parseSubstitutionDiv, parseTransferDiv, } from "./overlays.js";
-import { FLEXIBLE_LESSON_TYPE_PATTERN, FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
+import { FLEXIBLE_LESSON_TYPE_RE_I, LESSON_TYPE_RE, SUBGROUP_RE, WEEKS_RE, } from "./patterns.js";
 const DISTANCE_RE = /дистанционно|ДОТ/i;
 export function parseTeacherFullSchedule(html, educationType) {
     const doc = parseHtml(html);
@@ -88,12 +88,10 @@ function parseTeacherSessionSchedule(doc, educationType) {
         const cellHtml = dateCell.innerHTML ?? "";
         const brMatch = cellHtml.match(/<br\s*\/?>\s*(.+)/i);
         const weekday = brMatch ? brMatch[1].trim() : "";
-        const row = dateCell.parentElement;
-        if (!row)
-            continue;
-        const dataCell = row.querySelector("td.trdata:not(.trfd)");
-        if (!dataCell)
+        const dataCell = dateCell.nextElementSibling;
+        if (!dataCell?.matches("td.trdata:not(.trfd)")) {
             continue;
+        }
         const slots = [];
         for (const entryRow of dataCell.querySelectorAll("table tr")) {
             const td = entryRow.querySelector("td") ?? entryRow;
@@ -128,11 +126,15 @@ function parseTeacherSessionEntry(td) {
     const typeMatch = plainText.match(FLEXIBLE_LESSON_TYPE_RE_I);
     const type = typeMatch ? typeMatch[1].replace(/\.$/, "").toLowerCase() : "";
     const subgroupMatch = plainText.match(SUBGROUP_RE);
-    // Groups: text between </span> type and <br>time
-    const groupsMatch = fullHtml.match(new RegExp(`\\((?:${FLEXIBLE_LESSON_TYPE_PATTERN})\\)\\s*([^<]+?)\\s*<br`, "i"));
     const timeMatch = fullHtml.match(/<br\s*\/?>\s*(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
     if (!timeMatch)
         return null;
+    const parts = fullHtml
+        .split(/<br\s*\/?>/i)
+        .map((part) => part.replace(/<[^>]*>/g, "").trim())
+        .filter((part) => part.length > 0);
+    const groupsPart = parts.find((part) => !part.includes(subject) &&
+        !/^\d{2}:\d{2}\s*-\s*\d{2}:\d{2}$/.test(part)) ?? "";
     return {
         entry: {
             room,
@@ -140,7 +142,7 @@ function parseTeacherSessionEntry(td) {
             type,
             weeks: { from: 0, to: 0 },
             teacher: { name: "" },
-            groups: parseGroupsString(groupsMatch?.[1]),
+            groups: parseGroupsString(groupsPart),
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
             isDistance: DISTANCE_RE.test(plainText) || DISTANCE_RE.test(room),
             possibleChanges,

package/package.json

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