chuvsu-js 2.6.0 → 2.6.1

package/dist/tt/parse.js

@@ -130,9 +130,16 @@ function parseTransferDiv(div) {
         return null;
     const roomMatch = divHtml.match(/([А-Яа-яA-Za-z]-\d+)/);
     const typeMatch = divText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
-    // Teacher: last text line before closing </div>
+    // Teacher: last text line that isn't a subgroup marker
     const parts = divHtml.split(/<br\s*\/?>/);
-    const lastPart = parts[parts.length - 1]?.replace(/<[^>]*>/g, "").trim();
+    let teacherPart = "";
+    for (let i = parts.length - 1; i >= 0; i--) {
+        const clean = parts[i].replace(/<[^>]*>/g, "").trim();
+        if (clean && !/подгруппа/.test(clean)) {
+            teacherPart = clean;
+            break;
+        }
+    }
     const transfer = { targetDate, fromDate, fromSlot, subject };
     const subgroupMatch = divText.match(/(\d+)\s*подгруппа/);
     return {
@@ -142,7 +149,7 @@ function parseTransferDiv(div) {
             subject,
             type: typeMatch?.[1] ?? "",
             weeks: { from: 0, to: 0 },
-            teacher: parseTeacher(lastPart ?? ""),
+            teacher: parseTeacher(teacherPart),
             subgroup: subgroupMatch ? parseInt(subgroupMatch[1]) : undefined,
             transfer,
         },

package/dist/tt/utils.js

@@ -95,6 +95,10 @@ function isSameDay(a, b) {
 }
 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)
@@ -107,9 +111,6 @@ function filterEntries(entries, opts) {
                 return false;
             return isSameDay(e.substituteFor.date, opts.date);
         }
-        if (opts?.subgroup && e.subgroup && e.subgroup !== opts.subgroup) {
-            return false;
-        }
         if (opts?.week != null) {
             if (e.weeks.from > 0 &&
                 (opts.week < e.weeks.from || opts.week > e.weeks.to)) {

package/package.json

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