chuvsu-js 4.0.0 → 4.0.1

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

@@ -162,6 +162,7 @@ function parseSessionEntry(td) {
     const plainText = text(td);
     if (!plainText)
         return null;
+    const possibleChanges = (td.getAttribute("class") ?? "").includes("want") || undefined;
     const subjectEl = td.querySelector('span[style*="color: blue"]');
     const subject = subjectEl ? text(subjectEl) : "";
     if (!subject)
@@ -172,6 +173,14 @@ function parseSessionEntry(td) {
     // Type: parenthesized text after </span>, case-insensitive
     const typeMatch = plainText.match(FLEXIBLE_LESSON_TYPE_RE_I);
     const type = typeMatch ? typeMatch[1].replace(/\.$/, "").toLowerCase() : "";
+    const subgroupMatch = plainText.match(SUBGROUP_RE);
+    const parts = fullHtml
+        .split(/<br\s*\/?>/i)
+        .map((part) => part.replace(/<[^>]*>/g, "").trim())
+        .filter((part) => part.length > 0);
+    const teacherPart = parts.find((part) => !part.includes(subject) &&
+        !/^\d{2}:\d{2}\s*-\s*\d{2}:\d{2}$/.test(part) &&
+        !SUBGROUP_RE.test(part)) ?? "";
     // Time: after <br>, format HH:MM - HH:MM
     const timeMatch = fullHtml.match(/<br\s*\/?>\s*(\d{2}:\d{2})\s*-\s*(\d{2}:\d{2})/);
     if (!timeMatch)
@@ -182,8 +191,10 @@ function parseSessionEntry(td) {
             subject,
             type,
             weeks: { from: 0, to: 0 },
-            teacher: { name: "" },
+            teacher: parseTeacher(teacherPart),
             groups: [],
+            subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            possibleChanges,
         },
         timeStart: parseTime(timeMatch[1]),
         timeEnd: parseTime(timeMatch[2]),

package/dist/tt/parse/overlays.js

@@ -1,6 +1,7 @@
 import { parseTeacher, text } from "../../common/parse.js";
 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;
 export function parseDate(dd, mm, yyyy) {
     return new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
 }
@@ -29,8 +30,7 @@ export function parseTransferDiv(div) {
         const cleaned = part.trim();
         if (!cleaned)
             continue;
-        const groups = parseGroupsString(cleaned);
-        if (groups.length > 0) {
+        if (GROUP_CODE_RE.test(cleaned)) {
             groupsPart = cleaned;
             continue;
         }

package/dist/tt/parse/patterns.d.ts

@@ -1,5 +1,5 @@
-export declare const LESSON_TYPE_PATTERN = "\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441";
-export declare const FLEXIBLE_LESSON_TYPE_PATTERN = "\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441\\.?|\u042D\u043A\u0437";
+export declare const LESSON_TYPE_PATTERN = "\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447\u043E|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441|\u043A\u043F";
+export declare const FLEXIBLE_LESSON_TYPE_PATTERN = "(?:\u043B\u043A|\u043F\u0440|\u043B\u0431|\u0437\u0430\u0447\u043E|\u0437\u0430\u0447|\u044D\u043A\u0437|\u043A\u043E\u043D\u0441|\u043A\u043F)\\.?|\u042D\u043A\u0437";
 export declare const LESSON_TYPE_RE: RegExp;
 export declare const LESSON_TYPE_RE_I: RegExp;
 export declare const FLEXIBLE_LESSON_TYPE_RE_I: RegExp;

package/dist/tt/parse/patterns.js

@@ -1,5 +1,5 @@
-export const LESSON_TYPE_PATTERN = "лк|пр|лб|зач|экз|конс";
-export const FLEXIBLE_LESSON_TYPE_PATTERN = `${LESSON_TYPE_PATTERN}\\.?|Экз`;
+export const LESSON_TYPE_PATTERN = "лк|пр|лб|зачо|зач|экз|конс|кп";
+export const FLEXIBLE_LESSON_TYPE_PATTERN = `(?:${LESSON_TYPE_PATTERN})\\.?|Экз`;
 export const LESSON_TYPE_RE = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`);
 export const LESSON_TYPE_RE_I = new RegExp(`\\((${LESSON_TYPE_PATTERN})\\)`, "i");
 export const FLEXIBLE_LESSON_TYPE_RE_I = new RegExp(`\\((${FLEXIBLE_LESSON_TYPE_PATTERN})\\)`, "i");

package/dist/tt/parse/teacher.js

@@ -116,6 +116,7 @@ function parseTeacherSessionEntry(td) {
     const plainText = text(td);
     if (!plainText)
         return null;
+    const possibleChanges = (td.getAttribute("class") ?? "").includes("want") || undefined;
     const subjectEl = td.querySelector('span[style*="color: blue"]');
     const subject = subjectEl ? text(subjectEl) : "";
     if (!subject)
@@ -124,6 +125,7 @@ function parseTeacherSessionEntry(td) {
     const room = roomMatch ? roomMatch[1].trim() : "";
     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})/);
@@ -137,6 +139,8 @@ function parseTeacherSessionEntry(td) {
             weeks: { from: 0, to: 0 },
             teacher: { name: "" },
             groups: parseGroupsString(groupsMatch?.[1]),
+            subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
+            possibleChanges,
         },
         timeStart: parseTime(timeMatch[1]),
         timeEnd: parseTime(timeMatch[2]),

package/package.json

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