@wilm-ai/wilma-client 1.6.0 → 1.6.1

package/dist/parsers/attendance.d.ts

@@ -12,8 +12,13 @@ import type { LessonNote, LessonNoteSummary } from "../types.js";
  * three grid columns but consumes one index, so by the third or fourth cell
  * the index has drifted from the true grid column.
  *
- * Title attribute on event cells: "TypeLabel /TeacherName" or
- * "SubjectCode; TypeLabel /TeacherName".
+ * Two kinds of event cells: absence-type marks (`<td class="at-tpN">`, whose
+ * text is the teacher's code) and free-text remarks such as praise or
+ * behaviour notes (`<td class="at-tp-other">`, whose text is a `<small>`
+ * label plus an optional `<sup>` footnote marker pointing at the
+ * "Huomioita" column). The title attribute carries the details:
+ * "TypeLabel /TeacherName", "SubjectCode; TypeLabel /TeacherName" or
+ * "SubjectCode; TypeLabel; teacher's note /TeacherName".
  */
 export declare function parseAttendanceHtml(html: string, date?: string): LessonNote[];
 /** Count lesson notes by kind (absences, lateness, feedback…), most common first. */

package/dist/parsers/attendance.js

@@ -12,8 +12,13 @@ import * as cheerio from "cheerio";
  * three grid columns but consumes one index, so by the third or fourth cell
  * the index has drifted from the true grid column.
  *
- * Title attribute on event cells: "TypeLabel /TeacherName" or
- * "SubjectCode; TypeLabel /TeacherName".
+ * Two kinds of event cells: absence-type marks (`<td class="at-tpN">`, whose
+ * text is the teacher's code) and free-text remarks such as praise or
+ * behaviour notes (`<td class="at-tp-other">`, whose text is a `<small>`
+ * label plus an optional `<sup>` footnote marker pointing at the
+ * "Huomioita" column). The title attribute carries the details:
+ * "TypeLabel /TeacherName", "SubjectCode; TypeLabel /TeacherName" or
+ * "SubjectCode; TypeLabel; teacher's note /TeacherName".
  */
 export function parseAttendanceHtml(html, date) {
     const $ = cheerio.load(html);
@@ -62,10 +67,14 @@ export function parseAttendanceHtml(html, date) {
             for (let i = 2; i < cells.length; i++) {
                 const $cell = $(cells[i]);
                 const colspan = parseInt($cell.attr("colspan") ?? "1", 10) || 1;
-                const tpClass = (($cell.attr("class") ?? "").match(/\bat-tp\d+\b/) ?? [])[0];
+                const tpClass = (($cell.attr("class") ?? "").match(/\bat-tp(?:\d+|-other)\b/) ?? [])[0];
                 if (tpClass) {
+                    const isRemark = tpClass === "at-tp-other";
                     const title = ($cell.attr("title") ?? "").trim();
-                    const cellText = $cell.text().trim();
+                    // The visible text: a remark's <small> label, or an absence mark's
+                    // teacher code; a <sup> footnote marker is never part of either.
+                    const $small = $cell.find("small");
+                    const cellText = ($small.length ? $small.text() : $cell.clone().find("sup").remove().end().text()).trim();
                     // Title formats observed:
                     //   "TypeLabel /TeacherFullName"
                     //   "SubjectCode; TypeLabel /TeacherFullName"
@@ -76,7 +85,8 @@ export function parseAttendanceHtml(html, date) {
                     let subject = "";
                     let typeLabel = "";
                     let note = null;
-                    let teacher = cellText;
+                    // A remark's cell text is its label, never a teacher.
+                    let teacher = isRemark ? "" : cellText;
                     if (title) {
                         let rest = title;
                         const slashIdx = rest.lastIndexOf(" /");
@@ -113,7 +123,7 @@ export function parseAttendanceHtml(html, date) {
                         start,
                         end,
                         subject,
-                        typeLabel: typeLabel || tpClass.replace("at-tp", "Type "),
+                        typeLabel: typeLabel || (isRemark ? cellText : tpClass.replace("at-tp", "Type ")),
                         typeClass: tpClass,
                         teacher,
                         note,

package/dist/parsers/schedule.js

@@ -98,7 +98,12 @@ export function parseTimetableJson(payload) {
             if (!/^\d{4}-\d{2}-\d{2}$/.test(date))
                 continue;
             for (const module of lesson.modules ?? []) {
-                const subject = (module.caption ?? "").trim();
+                // The caption is the course code, sometimes followed by the name
+                // ("BI_ Biologia", or just "yRUB1.1" in upper secondary schools); the
+                // name alone is in courseName. Lessons without a course (lunch, a
+                // class teacher's hour) have only a caption.
+                const caption = (module.caption ?? "").trim();
+                const subject = (module.courseName ?? "").trim() || caption;
                 const teachers = module.teachers ?? [];
                 const rooms = (module.rooms ?? []).map((room) => (room.abbreviation ?? room.caption ?? "").trim()).filter(Boolean);
                 lessons.push({
@@ -107,7 +112,7 @@ export function parseTimetableJson(payload) {
                     start,
                     end,
                     subject,
-                    subjectCode: firstSubjectToken(subject),
+                    subjectCode: firstSubjectToken(caption),
                     teacher: teachers.map((t) => [t.lastname, t.firstname].filter(Boolean).join(" ")).join(", "),
                     teacherCode: teachers.map((t) => t.abbreviation ?? "").filter(Boolean).join(", "),
                     groupId: Number(module.id) || 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wilm-ai/wilma-client",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Unofficial client for Wilma, the Finnish school information system: login (with two-step verification), schedule, homework, exams, messages and news.",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "lint": "tsc -p tsconfig.json --noEmit",
-    "test": "pnpm run build && node test/login.mjs && node test/parser-messages.mjs && node test/parser-news.mjs && node test/parser-schedule.mjs && node test/parser-students.mjs && node test/client-students.mjs && node test/client-schedule.mjs && node test/client-news-resources.mjs && node test/network-error.mjs && node test/audit.mjs && node test/real-pages.mjs && node test/client-features.mjs",
+    "test": "pnpm run build && node test/login.mjs && node test/parser-attendance.mjs && node test/parser-messages.mjs && node test/parser-news.mjs && node test/parser-schedule.mjs && node test/parser-students.mjs && node test/client-students.mjs && node test/client-schedule.mjs && node test/client-attendance.mjs && node test/client-news-resources.mjs && node test/network-error.mjs && node test/audit.mjs && node test/real-pages.mjs && node test/client-features.mjs",
     "test:live": "tsc -p tsconfig.json && node test/live.spec.mjs",
     "fixtures:anonymize": "node scripts/anonymize-fixture.mjs"
   },