chuvsu-js 2.4.0 → 2.4.1

package/dist/common/parse.js

@@ -31,7 +31,7 @@ export function parseTeacher(s) {
     const trimmed = s.trim();
     if (!trimmed)
         return { name: "" };
-    const posMatch = trimmed.match(/^(доц\.|проф\.|ст\.преп\.|ст\. преп\.|преп\.|асс\.)\s*/);
+    const posMatch = trimmed.match(/^(доц\.|проф\.|ст\.преп\.|ст\. преп\.|преп\.|асс\.|зав\.каф\.)\s*/);
     const afterPos = posMatch ? trimmed.slice(posMatch[0].length) : trimmed;
     const degMatch = afterPos.match(/^([кд]\.[а-яё.-]+н\.)\s*/);
     const name = degMatch ? afterPos.slice(degMatch[0].length).trim() : afterPos.trim();

package/dist/tt/parse.js

@@ -185,17 +185,24 @@ function parseSemesterEntry(el) {
         if (sub)
             substitutions.push(sub);
     }
+    // Strip red divs from HTML/text before parsing the regular entry
+    let cleanHtml = fullHtml;
+    let cleanText = plainText;
+    for (const div of redDivs) {
+        cleanHtml = cleanHtml.replace(div.outerHTML ?? "", "");
+        cleanText = cleanText.replace(text(div), "");
+    }
     // Parse regular entry
     const subjectEl = td.querySelector('span[style*="color: blue"]');
     const subject = subjectEl ? text(subjectEl) : "";
     if (!subject)
         return null;
-    const typeMatch = plainText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
-    const weeksMatch = plainText.match(/\(([^)]*нед\.?[^)]*)\)/);
-    const roomMatch = fullHtml.match(/(?:<sup>[^<]*<\/sup>)?([А-Яа-яA-Za-z]-\d+)/);
-    const teacherMatch = fullHtml.match(/<br\s*\/?>\s*([^<]+?)(?:<br|<\/td|<i|$)/);
-    const subgroupMatch = plainText.match(/(\d+)\s*подгруппа/);
-    const weekParity = parseWeekParity(fullHtml);
+    const typeMatch = cleanText.match(/\((лк|пр|лб|зач|экз|зчО|кр|конс)\)/);
+    const weeksMatch = cleanText.match(/\(([^)]*нед\.?[^)]*)\)/);
+    const roomMatch = cleanHtml.match(/(?:<sup>[^<]*<\/sup>)?([А-Яа-яA-Za-z]-\d+)/);
+    const teacherMatch = cleanHtml.match(/<br\s*\/?>\s*([^<]+?)(?:<br|<\/td|<div|<i|$)/);
+    const subgroupMatch = cleanText.match(/(\d+)\s*подгруппа/);
+    const weekParity = parseWeekParity(cleanHtml);
     return {
         room: roomMatch?.[1] ?? "",
         subject,

package/package.json

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